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

Merge branch 'maint-0.3.2'

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

c2f413e24524cd377a9e064111235f7ea3ff10dd