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

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" to avoid version bump.
---

46910c060f6d0065f1745500e2bef89da8f8801a