From: teor <teor@torproject.org>
Date: Tue, 3 Dec 2019 02:46:43 +0000 (+1000)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.0
X-Git-Tag: tor-0.4.0.6~7^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=febbc236d4a813bf086c5cc3dcd0fa93c7f3eab1;p=thirdparty%2Ftor.git

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

febbc236d4a813bf086c5cc3dcd0fa93c7f3eab1