]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5
authorteor <teor@torproject.org>
Tue, 11 Jun 2019 04:51:37 +0000 (14:51 +1000)
committerteor <teor@torproject.org>
Tue, 11 Jun 2019 04:51:37 +0000 (14:51 +1000)
1  2 
.travis.yml
src/test/test_rebind.py

diff --cc .travis.yml
Simple merge
Simple merge