]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5
authorteor <teor@torproject.org>
Tue, 11 Jun 2019 04:46:24 +0000 (14:46 +1000)
committerteor <teor@torproject.org>
Tue, 11 Jun 2019 04:46:24 +0000 (14:46 +1000)

Trivial merge