]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f4fa42 c22696e)
Merge branch 'maint-0.4.1' into maint-0.4.2
authorteor <teor@torproject.org>
Mon, 16 Mar 2020 10:54:27 +0000 (20:54 +1000)
committerteor <teor@torproject.org>
Mon, 16 Mar 2020 10:54:27 +0000 (20:54 +1000)
1  2 
.travis.yml patch | diff1 | diff2 | blob | history

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