Please review my branch [geoip-mar2013](https://gitweb.torproject.org/karsten/tor.git/shortlog/refs/heads/geoip-mar2013) and merge it into maint-0.2.2 and subsequent maintained branches. Also, please merge my branch [geoip-manual-update-mar2013](https://gitweb.torproject.org/karsten/tor.git/shortlog/refs/heads/geoip-manual-update-mar2013) into master. MaxMind added fourteen new 'A1' ranges that the automatic substitution algorithm couldn't fix and that I had to fix manually.