]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4
authorteor <teor@torproject.org>
Wed, 13 Mar 2019 20:56:09 +0000 (06:56 +1000)
committerteor <teor@torproject.org>
Wed, 13 Mar 2019 20:56:09 +0000 (06:56 +1000)

Trivial merge