From: teor <teor@torproject.org>
Date: Tue, 26 Feb 2019 23:38:04 +0000 (+1000)
Subject: Merge branch 'maint-0.3.4' into maint-0.3.5
X-Git-Tag: tor-0.3.5.9~52^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15dc33849eda4fba651bf4096a9e405d737a977b;p=thirdparty%2Ftor.git

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

15dc33849eda4fba651bf4096a9e405d737a977b