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

Merge branch 'maint-0.3.2'

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

1fb3d37c08be1c1e9501990d1762c0fbb1f9388d