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