]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/971'
authorNick Mathewson <nickm@torproject.org>
Tue, 23 Apr 2019 16:52:54 +0000 (12:52 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 23 Apr 2019 16:52:54 +0000 (12:52 -0400)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge