]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug29036-029' into bug29036-29962-034
authorteor <teor@torproject.org>
Mon, 1 Apr 2019 04:07:58 +0000 (14:07 +1000)
committerteor <teor@torproject.org>
Mon, 1 Apr 2019 04:07:58 +0000 (14:07 +1000)
1  2 
.travis.yml
Makefile.am

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