From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 24 Oct 2017 13:10:37 +0000 (-0400)
Subject: Merge branch 'maint-0.3.1' into maint-0.3.2
X-Git-Tag: tor-0.3.2.3-alpha~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cce1a6efa6adbb90566fc6567c82c4410cd76bf9;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.1' into maint-0.3.2

"ours" merge to avoid version bump
---

cce1a6efa6adbb90566fc6567c82c4410cd76bf9