[or-cvs] [tor/release-0.2.2] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
arma at torproject.org
arma at torproject.org
Sat Jan 15 22:31:50 UTC 2011
commit 5ae391762c93fa4cdf47ceb24c31282daf695a65
Merge: 732275b d43cba6
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon Jan 10 14:12:33 2011 -0500
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
changes/geoip-jan2011 | 3 +
src/config/geoip | 5317 ++++++++++++++++++++++++++++++++-----------------
2 files changed, 3515 insertions(+), 1805 deletions(-)
More information about the tor-commits
mailing list