commit 6cad84503bcd58f2cbe6767a3363d398d46bf224 Merge: 1fee920 5ddb9b3 Author: Roger Dingledine arma@torproject.org Date: Fri Jul 6 16:32:08 2012 -0400

Merge branch 'maint-0.2.3'

changes/revert-geoip-may2012 | 6 + src/config/geoip |35480 ++++++++++++++++++++++++++---------------- 2 files changed, 22134 insertions(+), 13352 deletions(-)