]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 217db9e db71bce)
Merge branch 'tor-github/pr/879' into maint-0.4.0
authorGeorge Kadianakis <desnacked@riseup.net>
Fri, 5 Apr 2019 11:55:09 +0000 (14:55 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Fri, 5 Apr 2019 11:55:09 +0000 (14:55 +0300)
1  2 
.travis.yml patch | diff1 | diff2 | blob | history
Makefile.am patch | diff1 | diff2 | blob | history

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