From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 8 Nov 2017 21:45:03 +0000 (-0500)
Subject: Merge branch 'maint-0.3.2'
X-Git-Tag: tor-0.3.3.1-alpha~247
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e03a6369cf47814eaee2ec39f7041ef50bb505f0;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.2'

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

e03a6369cf47814eaee2ec39f7041ef50bb505f0