]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2804c6b 30b766b)
Merge remote branch 'origin/maint-0.2.1'
authorNick Mathewson <nickm@torproject.org>
Thu, 26 Aug 2010 18:32:22 +0000 (14:32 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 26 Aug 2010 18:32:22 +0000 (14:32 -0400)
1  2 
configure.in patch | diff1 | diff2 | blob | history

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