]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug32240_035' into bug32240_040
authorteor <teor@torproject.org>
Sun, 15 Dec 2019 23:14:32 +0000 (09:14 +1000)
committerteor <teor@torproject.org>
Sun, 15 Dec 2019 23:14:32 +0000 (09:14 +1000)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge