]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9464da2 49de586)
Merge branch 'maint-0.2.5' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 15:16:47 +0000 (10:16 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 15:16:47 +0000 (10:16 -0500)
1  2 
.travis.yml patch | diff1 | diff2 | blob | history

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