]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/bug27738-032' into bug27738-033
authorTaylor Yu <catalyst@torproject.org>
Wed, 10 Oct 2018 20:01:59 +0000 (15:01 -0500)
committerTaylor Yu <catalyst@torproject.org>
Wed, 10 Oct 2018 20:01:59 +0000 (15:01 -0500)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge