From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 24 Oct 2017 13:11:33 +0000 (-0400)
Subject: Merge branch 'maint-0.3.0' into maint-0.3.1
X-Git-Tag: tor-0.3.1.8~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=990322fca450d2230067a3035468c5ac7168e760;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" merge to avoid version bump
---

990322fca450d2230067a3035468c5ac7168e760