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

Merge branch 'maint-0.2.9' into maint-0.3.5

`git merge --strategy ours` to take the 0.3.5 changes for 31001,
and ignore the conflicting 0.2.9 changes.
---

1ea19d7a5bf538f5b9f0988c2375966f88d87867