]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6751899 b7e533c)
Merge commit 'linus/master'
authorRoger Dingledine <arma@torproject.org>
Fri, 7 May 2010 21:27:17 +0000 (17:27 -0400)
committerRoger Dingledine <arma@torproject.org>
Fri, 7 May 2010 21:27:17 +0000 (17:27 -0400)
1  2 
configure.in patch | diff1 | diff2 | blob | history

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