]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1271' into maint-0.3.5
authorteor <teor@torproject.org>
Thu, 5 Sep 2019 04:47:34 +0000 (14:47 +1000)
committerteor <teor@torproject.org>
Thu, 5 Sep 2019 04:47:34 +0000 (14:47 +1000)

Trivial merge