]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1bbe75d f0dc6c8)
Merge remote-tracking branch 'catalyst-github/bug25936-033' into maint-0.3.3
authorNick Mathewson <nickm@torproject.org>
Thu, 3 May 2018 17:38:51 +0000 (13:38 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 May 2018 17:38:51 +0000 (13:38 -0400)
1  2 
.travis.yml patch | diff1 | diff2 | blob | history

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