From: teor <teor@torproject.org>
Date: Tue, 22 Oct 2019 22:47:01 +0000 (+1000)
Subject: Merge branch 'maint-0.2.9' into maint-0.3.5
X-Git-Tag: tor-0.3.5.9~14^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d175e70817ccff01cd9eb73d8da9e306745fb469;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.9' into maint-0.3.5
---

d175e70817ccff01cd9eb73d8da9e306745fb469