]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 131ab9d fcbbcf9)
Merge branch 'nss-travis' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Wed, 24 Oct 2018 12:57:22 +0000 (08:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 24 Oct 2018 12:57:22 +0000 (08:57 -0400)
1  2 
.travis.yml patch | diff1 | diff2 | blob | history

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