From: teor <teor@torproject.org>
Date: Thu, 5 Dec 2019 00:14:08 +0000 (+1000)
Subject: Merge branch 'maint-0.4.1' into maint-0.4.2
X-Git-Tag: tor-0.4.2.5~6^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb786797aa449389d47f7bf94fb5fa238e51e377;p=thirdparty%2Ftor.git

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

bb786797aa449389d47f7bf94fb5fa238e51e377