]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 754d4e9 0f218a0)
Merge branch 'maint-0.4.2' into maint-0.4.3
authorDavid Goulet <dgoulet@torproject.org>
Fri, 12 Jun 2020 16:55:41 +0000 (12:55 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Fri, 12 Jun 2020 16:55:41 +0000 (12:55 -0400)
1  2 
.travis.yml patch | diff1 | diff2 | blob | history

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