From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 27 Mar 2018 22:24:37 +0000 (-0400)
Subject: Merge branch 'maint-0.3.1' into maint-0.3.2
X-Git-Tag: tor-0.3.2.11~42^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e7d505850607a16f6051a19ff60c39ff4c8393e;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.1' into maint-0.3.2

"ours" merge to avoid earlier version of 25629 fix.
---

5e7d505850607a16f6051a19ff60c39ff4c8393e