]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c8024b6 08e8c21)
Merge remote-tracking branch 'origin/maint-0.2.6'
authorNick Mathewson <nickm@torproject.org>
Tue, 26 May 2015 13:41:30 +0000 (09:41 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 26 May 2015 13:41:30 +0000 (09:41 -0400)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
Mirror of https://git.torproject.org/tor.git