]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c028532 430dd2d)
Merge branch 'maint-0.4.0' into maint-0.4.1
authorNick Mathewson <nickm@torproject.org>
Mon, 10 Jun 2019 22:33:26 +0000 (18:33 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 10 Jun 2019 22:33:26 +0000 (18:33 -0400)
1  2 
.travis.yml patch | diff1 | diff2 | blob | history
src/test/test_rebind.sh patch | diff1 | diff2 | blob | history

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