]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1049' into maint-0.4.0
authorteor <teor@torproject.org>
Sun, 11 Aug 2019 23:55:29 +0000 (09:55 +1000)
committerteor <teor@torproject.org>
Sun, 11 Aug 2019 23:55:29 +0000 (09:55 +1000)

Trivial merge