​[geoip-aug2014](https://gitweb.torproject.org/karsten/tor.git/shortlog/refs/heads/geoip-aug2014) contains the updated geoip file with IPv4 ranges and is supposed to be merged into maint-0.2.3. ​[geoip6-aug2014](https://gitweb.torproject.org/karsten/tor.git/shortlog/refs/heads/geoip6-aug2014) contains the updated geoip6 file with IPv6 ranges and is supposed to be merged into maint-0.2.4 (the first maint-* branch that contains a geoip6 file).