]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19429fa 7cea5a2)
Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Tue, 11 Sep 2018 17:08:57 +0000 (13:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 11 Sep 2018 17:08:57 +0000 (13:08 -0400)
1  2 
.travis.yml patch | diff1 | diff2 | blob | history

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