From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 9 Jan 2018 15:12:43 +0000 (-0500)
Subject: Merge branch 'maint-0.3.2'
X-Git-Tag: tor-0.3.3.1-alpha~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29784d80faab3d8307916c7a945e89fe082e3db0;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.2'

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

29784d80faab3d8307916c7a945e89fe082e3db0