]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1462'
authorteor <teor@torproject.org>
Fri, 25 Oct 2019 06:14:37 +0000 (16:14 +1000)
committerteor <teor@torproject.org>
Fri, 25 Oct 2019 06:14:37 +0000 (16:14 +1000)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge