commit 0a083b0188cacd2f07838ff0446113bd5211a024 Merge: 5b8bfb3 56180d1 Author: Roger Dingledine arma@torproject.org Date: Thu Oct 13 10:14:38 2011 -0400

Merge branch 'maint-0.2.2'

changes/geoip-october2011 | 3 + src/config/geoip | 5460 +++++++++++++++++++++++++++------------------ 2 files changed, 3307 insertions(+), 2156 deletions(-)