From: teor <teor@torproject.org>
Date: Tue, 22 Oct 2019 10:48:05 +0000 (+1000)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.0
X-Git-Tag: tor-0.4.0.6~16^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9bb0ca122f13255982566b440b0b9d03b6a9e44b;p=thirdparty%2Ftor.git

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

9bb0ca122f13255982566b440b0b9d03b6a9e44b