]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1680'
authorNick Mathewson <nickm@torproject.org>
Tue, 28 Jan 2020 13:15:21 +0000 (08:15 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 28 Jan 2020 13:15:21 +0000 (08:15 -0500)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge