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

Merge branch 'maint-0.4.0' into maint-0.4.1
---

ffccf6fc55f691e01ccd3e756486415cbc7ffe8a