From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 21 Feb 2019 18:23:52 +0000 (-0500)
Subject: Merge branch 'maint-0.3.4' into maint-0.3.5
X-Git-Tag: tor-0.3.5.9~54^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1079266e73c70cc0e5141249ebf3199a849017d;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" to avoid version bump.
---

e1079266e73c70cc0e5141249ebf3199a849017d