Please review my branch [geoip-jun2013](https://gitweb.torproject.org/karsten/tor.git/shortlog/refs/heads/geoip-jun2013) and merge it into maint-0.2.2 and subsequent maintained branches. Also, please merge my branch [geoip-manual-update-jun2013](https://gitweb.torproject.org/karsten/tor.git/shortlog/refs/heads/geoip-manual-update-jun2013) into master. MaxMind removed a couple 'A1' ranges that we don't have to fix manually anymore.