From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 7 Nov 2017 18:22:37 +0000 (-0500)
Subject: Merge branch 'maint-0.3.2'
X-Git-Tag: tor-0.3.3.1-alpha~254
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91e82baa8d82e147e490922d5447596cdc621054;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.2'

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

91e82baa8d82e147e490922d5447596cdc621054