From: teor <teor@torproject.org>
Date: Mon, 25 Nov 2019 02:36:59 +0000 (+1000)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.0
X-Git-Tag: tor-0.4.0.6~8^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=055f5d4d1b2c8ea5a85691f7110e82a9c468b6dd;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5' into maint-0.4.0
---

055f5d4d1b2c8ea5a85691f7110e82a9c468b6dd