]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.4.1'
authorteor <teor@torproject.org>
Thu, 8 Aug 2019 01:20:07 +0000 (11:20 +1000)
committerteor <teor@torproject.org>
Thu, 8 Aug 2019 01:20:07 +0000 (11:20 +1000)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge