]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ffccf6f d96b35d)
Merge branch 'maint-0.4.0' into maint-0.4.1
authorteor <teor@torproject.org>
Fri, 20 Dec 2019 00:12:43 +0000 (10:12 +1000)
committerteor <teor@torproject.org>
Fri, 20 Dec 2019 00:12:43 +0000 (10:12 +1000)
1  2 
.travis.yml patch | diff1 | diff2 | blob | history

diff --cc .travis.yml
Simple merge
Mirror of https://git.torproject.org/tor.git