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

Merge branch 'maint-0.3.2'

"ours" to avoid version bump.
---

ce4a381935d9c0c2b4003a25fd611a11ada6a160