]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.3.5' into maint-0.4.0
authorGeorge Kadianakis <desnacked@riseup.net>
Tue, 27 Aug 2019 08:49:36 +0000 (11:49 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Tue, 27 Aug 2019 08:49:36 +0000 (11:49 +0300)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge