]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1211' into test31343_040
authorteor <teor@torproject.org>
Thu, 8 Aug 2019 23:50:50 +0000 (09:50 +1000)
committerteor <teor@torproject.org>
Thu, 8 Aug 2019 23:50:50 +0000 (09:50 +1000)

Trivial merge