]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket32629_040' into ticket32629_041
authorteor <teor@torproject.org>
Sun, 1 Dec 2019 10:26:55 +0000 (20:26 +1000)
committerteor <teor@torproject.org>
Sun, 1 Dec 2019 10:26:55 +0000 (20:26 +1000)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge