From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 1 Dec 2017 14:35:31 +0000 (-0500)
Subject: Merge branch 'maint-0.3.1' into maint-0.3.2
X-Git-Tag: tor-0.3.2.7-rc~22^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=909c91049a424776c563363312f93dcdc4cdb241;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.1' into maint-0.3.2

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

909c91049a424776c563363312f93dcdc4cdb241