From: teor <teor@torproject.org>
Date: Sun, 15 Dec 2019 22:15:55 +0000 (+1000)
Subject: Merge branch 'maint-0.2.9' into maint-0.3.5
X-Git-Tag: tor-0.3.5.10~15^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1cd20ff848eab6ee7b441c5aab0578ab02a114bc;p=thirdparty%2Ftor.git

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

1cd20ff848eab6ee7b441c5aab0578ab02a114bc