]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1577' into maint-0.4.2
authorteor <teor@torproject.org>
Sun, 15 Dec 2019 22:14:29 +0000 (08:14 +1000)
committerteor <teor@torproject.org>
Sun, 15 Dec 2019 22:14:29 +0000 (08:14 +1000)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge