]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1432' into maint-0.4.2
authorteor <teor@torproject.org>
Sun, 20 Oct 2019 23:45:18 +0000 (09:45 +1000)
committerteor <teor@torproject.org>
Sun, 20 Oct 2019 23:45:18 +0000 (09:45 +1000)

Trivial merge