diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-10-11 11:17:25 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-10-11 11:17:25 -0400 |
| commit | 3e3b9219ec968f21ab0956dd785c17541a908d5b (patch) | |
| tree | b33b11fd14d13b6ba1a424a46ddf33ce61c2378c /src/config | |
| parent | 64293135df7611b7caa939eee57a8f0b9d29e617 (diff) | |
| parent | f4ef7c76f399d4c3321202ebed55a66105378f04 (diff) | |
| download | tor-3e3b9219ec968f21ab0956dd785c17541a908d5b.tar tor-3e3b9219ec968f21ab0956dd785c17541a908d5b.tar.gz | |
Merge remote-tracking branch 'karsten/geoip-manual-update-oct2013'
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/geoip-manual | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/config/geoip-manual b/src/config/geoip-manual index 061769f82..d51a12a1c 100644 --- a/src/config/geoip-manual +++ b/src/config/geoip-manual @@ -60,13 +60,10 @@ # US, because ARIN says 199.255.208.0-199.255.215.255 is US. # Changed entry start from 199.255.213.0 to 199.255.208.0 on 2013-08-12. -# -KL 2013-08-12 -"199.255.208.0","199.255.215.255","3355430912","3355432959","US","United States" - -# US, because previous MaxMind entry 209.58.176.144-209.59.31.255 is US, -# and RIR delegation files say 209.59.32.0-209.59.63.255 is US. -# -KL 2012-11-27 -"209.59.32.0","209.59.63.255","3510312960","3510321151","US","United States" +# Split up into 199.255.208.0-199.255.209.127 and +# 199.255.210.0-199.255.215.255 on 2013-10-11. -KL 2013-10-11 +"199.255.208.0","199.255.209.127","3355430912","3355431295","US","United States" +"199.255.210.0","199.255.215.255","3355431424","3355432959","US","United States" # EU, despite neither previous (RU) nor next (SE) MaxMind entry being EU, # but because RIR delegation files agree with previous MaxMind entry and |