]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1370' into maint-0.3.5
authorteor <teor@torproject.org>
Thu, 17 Oct 2019 04:50:28 +0000 (14:50 +1000)
committerteor <teor@torproject.org>
Thu, 17 Oct 2019 04:50:28 +0000 (14:50 +1000)

Trivial merge