]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1c110a 6463cde)
Merge branch 'travis-osx-033' into travis-osx-034
authorteor <teor@torproject.org>
Fri, 10 Aug 2018 09:06:45 +0000 (19:06 +1000)
committerteor <teor@torproject.org>
Fri, 10 Aug 2018 09:06:45 +0000 (19:06 +1000)
1  2 
.travis.yml patch | diff1 | diff2 | blob | history

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