commit 6426cd14f37c2b24232f02d5c978313fab6a667f Merge: 0044697 d080fe8 Author: Roger Dingledine arma@torproject.org Date: Tue Mar 8 18:16:06 2011 -0500

Merge branch 'maint-0.2.1' into maint-0.2.2

changes/geoip-mar2011 | 3 + src/config/geoip | 7639 ++++++++++++++++++++++++++++--------------------- 2 files changed, 4420 insertions(+), 3222 deletions(-)