From: teor <teor@torproject.org>
Date: Fri, 5 Apr 2019 23:33:28 +0000 (+1000)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.0
X-Git-Tag: tor-0.4.0.4-rc~11^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b3b605a1529e34eb42926db7c38d046a3f1bacb;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5' into maint-0.4.0
---

8b3b605a1529e34eb42926db7c38d046a3f1bacb