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

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" merge to avoid the 0.3.3 version of #27550.
---

a88ce61b351412a9a62c8e2340773b5b682f1b17