From: teor <teor@torproject.org>
Date: Fri, 19 Apr 2019 01:39:17 +0000 (+1000)
Subject: Merge branch 'maint-0.2.9' into maint-0.3.4
X-Git-Tag: tor-0.4.1.1-alpha~4^2~3^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d504bf098069538984690de7966a907180c7efe;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.9' into maint-0.3.4

"ours" merge, to avoid taking any changes from PR 772 in 0.3.4.
(We already merged a different fix for 23790 into 0.3.2 and later.)
---

4d504bf098069538984690de7966a907180c7efe