From: teor <teor@torproject.org>
Date: Mon, 12 Aug 2019 03:10:05 +0000 (+1000)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.0
X-Git-Tag: tor-0.4.0.6~29^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=20943d00f10af11133d9ece90f1cbed658a21aed;p=thirdparty%2Ftor.git

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

20943d00f10af11133d9ece90f1cbed658a21aed