]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e37d86 2dd7df8)
Merge remote branch 'sebastian/bug2337' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Wed, 12 Jan 2011 17:55:09 +0000 (12:55 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 12 Jan 2011 17:55:09 +0000 (12:55 -0500)
1  2 
configure.in patch | diff1 | diff2 | blob | history

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