From: teor <teor@torproject.org>
Date: Thu, 17 Oct 2019 04:51:58 +0000 (+1000)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.0
X-Git-Tag: tor-0.4.0.6~18^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e483257e1bc826b5678fcbf13084fd5d811f2b12;p=thirdparty%2Ftor.git

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

e483257e1bc826b5678fcbf13084fd5d811f2b12