]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/866'
authorteor <teor@torproject.org>
Tue, 9 Apr 2019 01:36:38 +0000 (11:36 +1000)
committerteor <teor@torproject.org>
Tue, 9 Apr 2019 01:36:38 +0000 (11:36 +1000)

Trivial merge