From: teor <teor@torproject.org>
Date: Thu, 9 Apr 2020 01:03:20 +0000 (+1000)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.1
X-Git-Tag: tor-0.4.2.8~27^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=987f2fa50ac26af61917c7a6e13dc62f3ddb23ee;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5' into maint-0.4.1
---

987f2fa50ac26af61917c7a6e13dc62f3ddb23ee