From: teor <teor@torproject.org>
Date: Sun, 15 Dec 2019 22:16:20 +0000 (+1000)
Subject: Merge branch 'maint-0.4.1' into maint-0.4.2
X-Git-Tag: tor-0.4.2.6~13^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd11fb10962f5b6e7d51ff5a0e6263ad39d4d184;p=thirdparty%2Ftor.git

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

bd11fb10962f5b6e7d51ff5a0e6263ad39d4d184