From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 3 Mar 2018 16:33:33 +0000 (-0500)
Subject: Merge branch 'maint-0.3.2' into maint-0.3.3
X-Git-Tag: tor-0.3.3.4-alpha~29^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=35d945a646b3384640d3863aec07d873179efffd;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.2' into maint-0.3.3

"ours" merge to avoid version bump.
---

35d945a646b3384640d3863aec07d873179efffd