From: teor <teor@torproject.org>
Date: Tue, 2 Apr 2019 01:45:31 +0000 (+1000)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.0
X-Git-Tag: tor-0.4.0.4-rc~21^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9242f32883e2eff53ddc8217255168e91c6e3e7f;p=thirdparty%2Ftor.git

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

9242f32883e2eff53ddc8217255168e91c6e3e7f