From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 19 Jan 2018 15:17:33 +0000 (-0500)
Subject: Merge branch 'maint-0.3.0' into maint-0.3.1
X-Git-Tag: tor-0.3.1.10~23^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b19e33bedcdd107d0599ab795cccfc2d7cb93dc;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" merge to avoid 0.2.5 version of #24863 fix.
---

9b19e33bedcdd107d0599ab795cccfc2d7cb93dc