]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/971' into maint-0.4.0
authorNick Mathewson <nickm@torproject.org>
Wed, 5 Jun 2019 20:12:07 +0000 (16:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 5 Jun 2019 20:12:07 +0000 (16:12 -0400)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge