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

diff --cc .travis.yml
Simple merge