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

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