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

Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" merge to avoid maint-0.3.0's version of 24895.
---

7f2e23e7acc0735e5ae933535a1b617a0860e528