]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d0883e 0a661cd)
Merge branch 'maint-0.4.0' into maint-0.4.1
authorteor <teor@torproject.org>
Thu, 8 Aug 2019 01:19:58 +0000 (11:19 +1000)
committerteor <teor@torproject.org>
Thu, 8 Aug 2019 01:19:58 +0000 (11:19 +1000)
1  2 
.travis.yml patch | diff1 | diff2 | blob | history

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