]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/911' into maint-0.4.0
authorteor <teor@torproject.org>
Sat, 6 Apr 2019 02:15:41 +0000 (12:15 +1000)
committerteor <teor@torproject.org>
Sat, 6 Apr 2019 02:15:41 +0000 (12:15 +1000)

Trivial merge