Please review my branch [geoip-sep2013](https://gitweb.torproject.org/karsten/tor.git/shortlog/refs/heads/geoip-sep2013) and merge it into maint-0.2.2 and subsequent maintained branches. Also, please merge my branch ​[geoip-manual-update-sep2013](https://gitweb.torproject.org/karsten/tor.git/shortlog/refs/heads/geoip-manual-update-sep2013) into master.