]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55cf197 61c0bae)
Merge branch 'maint-0.2.7' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Mon, 9 May 2016 22:14:44 +0000 (18:14 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 May 2016 22:14:44 +0000 (18:14 -0400)
1  2 
Makefile.am patch | diff1 | diff2 | blob | history

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