From: teor <teor@torproject.org>
Date: Wed, 6 Nov 2019 01:19:54 +0000 (+1000)
Subject: Merge branch 'maint-0.4.1' into maint-0.4.2
X-Git-Tag: tor-0.4.2.4-rc~12^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76fd872db88782c6bce1b539e27ba1d1ab88cbdb;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.1' into maint-0.4.2
---

76fd872db88782c6bce1b539e27ba1d1ab88cbdb