]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 49a11f8 6ed3d8d)
Merge branch 'ticket31372_029' into ticket31372_035
authorNick Mathewson <nickm@torproject.org>
Tue, 24 Sep 2019 12:01:43 +0000 (08:01 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 24 Sep 2019 12:01:43 +0000 (08:01 -0400)
1  2 
.travis.yml patch | diff1 | diff2 | blob | history

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