]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket32177_035' into ticket32177_040
authorteor <teor@torproject.org>
Tue, 22 Oct 2019 09:43:33 +0000 (19:43 +1000)
committerteor <teor@torproject.org>
Tue, 22 Oct 2019 09:43:33 +0000 (19:43 +1000)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge