]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/989'
authorNick Mathewson <nickm@torproject.org>
Thu, 2 May 2019 12:36:09 +0000 (08:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 2 May 2019 12:36:09 +0000 (08:36 -0400)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge