]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'chutney_ci_v4_040' into chutney_ci_v4_041
authorteor <teor@torproject.org>
Mon, 1 Jul 2019 04:36:53 +0000 (14:36 +1000)
committerteor <teor@torproject.org>
Mon, 1 Jul 2019 04:36:53 +0000 (14:36 +1000)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge