]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug31463_040' into bug31463_041
authorteor <teor@torproject.org>
Thu, 22 Aug 2019 12:10:06 +0000 (22:10 +1000)
committerteor <teor@torproject.org>
Thu, 22 Aug 2019 12:10:06 +0000 (22:10 +1000)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge