From: teor <teor@torproject.org>
Date: Fri, 30 Aug 2019 13:33:01 +0000 (+1000)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.0
X-Git-Tag: tor-0.4.0.6~26^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a52a5e0099f9201e0dc1a358b1ac7721070caf56;p=thirdparty%2Ftor.git

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

a52a5e0099f9201e0dc1a358b1ac7721070caf56