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

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

3207a8e5c21de7d49d7e1c854bf6c0dba23d84a1