From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 14 Sep 2017 17:22:04 +0000 (-0400)
Subject: Merge branch 'maint-0.3.0' into maint-0.3.1
X-Git-Tag: tor-0.3.1.7~5^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2446d4acc506842963a2b4d52ddcea95b5f6cccf;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.0' into maint-0.3.1

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

2446d4acc506842963a2b4d52ddcea95b5f6cccf