From: teor <teor@torproject.org>
Date: Mon, 28 Oct 2019 22:26:40 +0000 (+1000)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.0
X-Git-Tag: tor-0.4.0.6~12^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54e2d0dc2d790a9e84ec44db2d53d535d8076602;p=thirdparty%2Ftor.git

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

54e2d0dc2d790a9e84ec44db2d53d535d8076602