]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ee65a6 1440c2c)
Merge branch 'tor-github/pr/1195'
authorGeorge Kadianakis <desnacked@riseup.net>
Tue, 6 Aug 2019 11:51:47 +0000 (14:51 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Tue, 6 Aug 2019 11:51:47 +0000 (14:51 +0300)
1  2 
Makefile.am patch | diff1 | diff2 | blob | history

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