From: teor <teor@torproject.org>
Date: Fri, 19 Apr 2019 02:00:41 +0000 (+1000)
Subject: Merge branch 'maint-0.3.4' into maint-0.3.5
X-Git-Tag: tor-0.3.5.9~37^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=231036a110c1062e39b214b4b88fdc2a1eb46dc8;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4' into maint-0.3.5
---

231036a110c1062e39b214b4b88fdc2a1eb46dc8