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

Merge branch 'maint-0.3.0' into maint-0.3.1

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

7fae562a4da62090817f8546e8f4a8a29dcf1c4a