diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-07-08 09:23:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-08 09:23:39 -0400 |
| commit | dd90ab4121ef37cf21cb78ca9a240f9ae1608221 (patch) | |
| tree | 3a32e2989ebb49bebcc3f3e2f316053aadff6973 /src/config | |
| parent | 20634fac5475c840478755101f0e92659accfd6b (diff) | |
| parent | 1a43dfa603ea2081821229f7ca0adfeaf618527f (diff) | |
| download | tor-dd90ab4121ef37cf21cb78ca9a240f9ae1608221.tar tor-dd90ab4121ef37cf21cb78ca9a240f9ae1608221.tar.gz | |
Merge remote-tracking branch 'karsten/geoip-manual-update-jul2013'
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/geoip-manual | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/config/geoip-manual b/src/config/geoip-manual index 1b392517f..ff9be5691 100644 --- a/src/config/geoip-manual +++ b/src/config/geoip-manual @@ -79,6 +79,9 @@ # -KL 2013-03-07 "81.171.81.0","81.171.81.127","1370181888","1370182015","NL","Netherlands" +# GB, because RIPE NCC says 85.237.192.0-85.237.223.255 is GB. +"85.237.222.0","85.237.222.255","1441652224","1441652479","GB","United Kingdom" + # BE, because next MaxMind entry 86.39.147.0-86.39.148.31 is BE, and RIR # delegation files say entire range 86.39.128.0-86.39.255.255 is BE. # -KL 2013-04-08 @@ -140,6 +143,9 @@ # 199.101.192.0-199.101.199.255 which is US. -KL 2013-05-13 "199.101.192.0","199.101.192.255","3345334272","3345334527","US","United States" +# US, because ARIN says 199.255.208.0-199.255.215.255 is US. +"199.255.213.0","199.255.215.255","3355432192","3355432959","US","United States" + # US, because next MaxMind entry 204.12.162.0-204.12.197.119 is US, and # RIR delegation files say 204.12.160.0-204.12.191.255 is US. # -KL 2013-05-13 |