From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 29 Jun 2017 20:36:05 +0000 (-0400)
Subject: Merge branch 'maint-0.3.0' into maint-0.3.1
X-Git-Tag: tor-0.3.1.4-alpha~5^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1494fa0d3b2a3902d0555bc5cc557b88c6130f48;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.0' into maint-0.3.1

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

1494fa0d3b2a3902d0555bc5cc557b88c6130f48