From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 26 Jun 2018 13:12:28 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~363
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06f3526b03a7a9462f26515ae7c2dde2b283a3fb;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'

"ours" to avoid version bump.
---

06f3526b03a7a9462f26515ae7c2dde2b283a3fb