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

Trivial merge