[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4