From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 1 Mar 2018 21:43:42 +0000 (-0500)
Subject: Merge branch 'maint-0.3.2' into maint-0.3.3
X-Git-Tag: tor-0.3.3.3-alpha~2^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0903ebd88a47a03a5e432e1a6c98452ae8a9008;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.2' into maint-0.3.3

"ours" to avoid version bump.
---

e0903ebd88a47a03a5e432e1a6c98452ae8a9008