From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 15 Nov 2018 22:08:04 +0000 (-0500)
Subject: Merge branch 'maint-0.3.4' into maint-0.3.5
X-Git-Tag: tor-0.3.5.5-alpha~4^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1b4075cb272a6f9a14cd0e0b8c73d359666fc479;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" merge to avoid taking 25573 and 27686 again.
---

1b4075cb272a6f9a14cd0e0b8c73d359666fc479