From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 5 Sep 2017 12:31:20 +0000 (-0400)
Subject: Merge branch 'maint-0.3.1'
X-Git-Tag: tor-0.3.2.1-alpha~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e58f11077e7c9f74708c65f1f59b8912e9a8e0b8;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.1'

"ours" merge to avoid version bump
---

e58f11077e7c9f74708c65f1f59b8912e9a8e0b8