]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1405' into maint-0.3.5
authorteor <teor@torproject.org>
Mon, 25 Nov 2019 02:33:55 +0000 (12:33 +1000)
committerteor <teor@torproject.org>
Mon, 25 Nov 2019 02:33:55 +0000 (12:33 +1000)

Trivial merge