From: teor <teor@torproject.org>
Date: Wed, 6 Nov 2019 01:19:38 +0000 (+1000)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.0
X-Git-Tag: tor-0.4.0.6~11^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03e77ef036e41486b8bfe138d11790c928f49f35;p=thirdparty%2Ftor.git

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

03e77ef036e41486b8bfe138d11790c928f49f35