Merge branch 'maint-0.3.4' into release-0.3.4
commit79f929723f12ce414a17789966972f97032db255
authorNick Mathewson <nickm@torproject.org>
Fri, 4 Jan 2019 19:57:06 +0000 (4 14:57 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 4 Jan 2019 19:57:06 +0000 (4 14:57 -0500)
treee8d8caed1c17df9ca2bb9fd14848d0308dd39c38
parentf81078527791b244c0200e53ac4862b36c21a1d9
parentfe3331b84554c6d6e2e633d77de02453b9a73f88
Merge branch 'maint-0.3.4' into release-0.3.4