]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1208c17 a1074c7)
Merge branch 'maint-0.2.2' into release-0.2.2
authorRoger Dingledine <arma@torproject.org>
Thu, 5 Jan 2012 11:46:01 +0000 (06:46 -0500)
committerRoger Dingledine <arma@torproject.org>
Thu, 5 Jan 2012 11:46:01 +0000 (06:46 -0500)
1  2 
configure.in patch | diff1 | diff2 | blob | history

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