commit 1587e0d47061fbdb5e53730172231765fdd351c9 Merge: ee871e7 9d2b384 Author: Roger Dingledine arma@torproject.org Date: Mon Apr 4 03:54:03 2011 -0400

Merge branch 'maint-0.2.2'

changes/geoip-apr2011 | 3 + src/config/geoip | 6197 ++++++++++++++++++++++++++++++++++--------------- 2 files changed, 4341 insertions(+), 1859 deletions(-)