From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 31 Jan 2018 19:33:27 +0000 (-0500)
Subject: Merge branch 'maint-0.3.2'
X-Git-Tag: tor-0.3.3.2-alpha~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d44080a09da4cf05c6b2895ef7ac97c65acdd8b8;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.2'

"ours" merge to avoid backport of #25105
---

d44080a09da4cf05c6b2895ef7ac97c65acdd8b8