]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e4b6a2 35b0ac8)
Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Wed, 5 Sep 2018 14:14:56 +0000 (10:14 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 5 Sep 2018 14:14:56 +0000 (10:14 -0400)
1  2 
.travis.yml patch | diff1 | diff2 | blob | history

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