Please review my branch [geoip-jan2013](https://gitweb.torproject.org/karsten/tor.git/shortlog/refs/heads/geoip-jan2013) and merge it into maint-0.2.2 and subsequent maintained branches.