]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/941'
authorGeorge Kadianakis <desnacked@riseup.net>
Mon, 15 Apr 2019 10:57:40 +0000 (13:57 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Mon, 15 Apr 2019 10:57:40 +0000 (13:57 +0300)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge