]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1236'
authorDavid Goulet <dgoulet@torproject.org>
Thu, 29 Aug 2019 16:58:25 +0000 (12:58 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Thu, 29 Aug 2019 16:58:25 +0000 (12:58 -0400)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge