]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5
authorteor <teor@torproject.org>
Tue, 22 Oct 2019 22:30:48 +0000 (08:30 +1000)
committerteor <teor@torproject.org>
Tue, 22 Oct 2019 22:30:48 +0000 (08:30 +1000)

Trivial merge