]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 247a213 1f5c562)
Merge remote-tracking branch 'sebastian/osx_deadstrip'
authorNick Mathewson <nickm@torproject.org>
Fri, 27 Jan 2012 16:49:34 +0000 (11:49 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 27 Jan 2012 16:49:34 +0000 (11:49 -0500)
1  2 
configure.in patch | diff1 | diff2 | blob | history

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