]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1424' into maint-0.4.0
authorteor <teor@torproject.org>
Thu, 5 Dec 2019 00:13:15 +0000 (10:13 +1000)
committerteor <teor@torproject.org>
Thu, 5 Dec 2019 00:13:15 +0000 (10:13 +1000)

Trivial merge