From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 1 Aug 2017 18:38:57 +0000 (-0400)
Subject: Merge branch 'maint-0.3.0' into maint-0.3.1
X-Git-Tag: tor-0.3.1.6-rc~23^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71248800f72e8ca438f4c61d2c3715258a1b986a;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.0' into maint-0.3.1

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

71248800f72e8ca438f4c61d2c3715258a1b986a