]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.4.2'
authorteor <teor@torproject.org>
Tue, 3 Dec 2019 02:47:05 +0000 (12:47 +1000)
committerteor <teor@torproject.org>
Tue, 3 Dec 2019 02:47:05 +0000 (12:47 +1000)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge