From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 2 Nov 2018 13:08:53 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4' into maint-0.3.5
X-Git-Tag: tor-0.3.5.4-alpha~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff05162710cb514b3c0c054b034dc9c2bd66e97d;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" to avoid version bump.
---

ff05162710cb514b3c0c054b034dc9c2bd66e97d