From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 7 Jan 2019 15:22:47 +0000 (-0500)
Subject: Merge branch 'maint-0.3.4' into maint-0.3.5
X-Git-Tag: tor-0.3.5.7~1^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d51595ec573df21cc96ee71fbb466d6a4e30ae1c;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" to avoid version bump.
---

d51595ec573df21cc96ee71fbb466d6a4e30ae1c