]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebb0ac3 7021d33)
Merge branch 'maint-0.3.0' into maint-0.3.1
authorNick Mathewson <nickm@torproject.org>
Wed, 26 Jul 2017 19:39:56 +0000 (15:39 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 26 Jul 2017 19:39:56 +0000 (15:39 -0400)
1  2 
.travis.yml patch | diff1 | diff2 | blob | history

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