]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9504f7 1cd20ff)
Merge branch 'maint-0.3.5' into maint-0.4.0
authorteor <teor@torproject.org>
Sun, 15 Dec 2019 22:16:04 +0000 (08:16 +1000)
committerteor <teor@torproject.org>
Sun, 15 Dec 2019 22:16:04 +0000 (08:16 +1000)
1  2 
.travis.yml patch | diff1 | diff2 | blob | history

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