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

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

e56e7e865e148c5017ae20df12c76df0f79e60c1