commit 8e3830352f806b680d1c60b66c8cc7fb67f76175 Merge: 3ab0976 51d6e95 Author: Roger Dingledine arma@torproject.org Date: Thu Jul 7 13:29:02 2011 -0400

Merge branch 'maint-0.2.1' into maint-0.2.2

changes/geoip-july2011 | 3 + src/config/geoip | 6345 ++++++++++++++++++++++++++++++------------------ 2 files changed, 3963 insertions(+), 2385 deletions(-)