Please review my branch [geoip-feb2013](https://gitweb.torproject.org/karsten/tor.git/shortlog/refs/heads/geoip-feb2013) and merge it into maint-0.2.2 and subsequent maintained branches. Also, please merge my branch [geoip-manual-update](https://gitweb.torproject.org/karsten/tor.git/shortlog/refs/heads/geoip-manual-update) into master. MaxMind took out an erroneous assignment range in their latest database, so we don't have to correct that anymore. There's a comment in that file saying this, so not worth a ChangeLog entry, IMO.