Merge remote-tracking branch 'karsten/geoip-manual-update-jun2013'

1 files changed, 0 insertions, 53 deletions

diff --git a/src/config/geoip-manual b/src/config/geoip-manual
index 6dfac26a4..1b392517f 100644
--- a/src/config/geoip-manual
+++ b/src/config/geoip-manual
@@ -3,15 +3,6 @@
 # directory to process this file when producing a new geoip file.  See
 # README.geoip in the same directory for details.
 
-# IN, though could as well be UA.  Previous MaxMind entry
-# 5.56.23.0-5.56.23.127 is IN, next MaxMind entry 5.56.24.0-5.56.31.255 is
-# UA, and RIR delegation files say the entire block
-# 5.56.16.0-5.56.23.255 is DE.  -KL 2013-04-08
-# Changed to DE, because range has changed, next MaxMind entry
-# 5.56.23.192-5.56.23.255 is DE, and RIR delegation files say the entire
-# block 5.56.16.0-5.56.23.255 is DE.  -KL 2013-05-13
-"5.56.23.128","5.56.23.191","87562112","87562175","DE","Germany"
-
 # GB, because previous MaxMind entry 31.6.16.0-31.6.25.255 is GB, and RIR
 # delegation files say entire range 31.6.0.0-31.6.63.255 is GB.
 # -KL 2013-03-07
@@ -59,19 +50,10 @@
 # -KL 2013-03-07
 "64.185.237.110","64.185.237.110","1085926766","1085926766","",""
 
-# US, though could as well be UY.  Previous MaxMind entry
-# 67.15.170.0-67.15.182.255 is US, next MaxMind entry
-# 67.15.183.128-67.15.183.159 is UY, and RIR delegation files say the
-# entire block 67.15.0.0-67.15.255.255 is US.  -KL 2012-11-27
-"67.15.183.0","67.15.183.127","1125103360","1125103487","US","United States"
-
 # US, because next MaxMind entry 67.43.145.0-67.43.155.255 is US, and RIR
 # delegation files say 67.43.144.0-67.43.159.255 is US.
 # -KL 2012-11-27
 "67.43.144.0","67.43.144.255","1126928384","1126928639","US","United States"
-# US, because previous MaxMind entry 68.68.101.232-68.68.102.71 is US, and
-# RIR delegation files say 68.68.64.0-68.68.79.255 is US.  -KL 2013-05-13
-"68.68.102.72","68.68.102.79","1145333320","1145333327","US","United States"
 
 # US, because previous MaxMind entry 70.159.21.51-70.232.244.255 is US,
 # because next MaxMind entry 70.232.245.58-70.232.245.59 is A2 ("Satellite
@@ -87,11 +69,6 @@
 # US.  -KL 2012-11-27
 "70.232.245.60","70.232.245.255","1189672252","1189672447","US","United States"
 
-# GB, because next MaxMind entry 77.242.197.0-77.242.197.255 is GB, and
-# RIR delegation files say entire range 77.242.192.0-77.242.207.255 is GB.
-# -KL 2013-03-07
-"77.242.196.0","77.242.196.255","1307755520","1307755775","GB","United Kingdom"
-
 # SE, because previous MaxMind entry 80.67.11.200-80.67.13.255 is SE, and
 # RIR delegation files say entire range 80.67.0.0-80.67.15.255 is SE.
 # -KL 2013-03-07
@@ -123,13 +100,6 @@
 # -KL 2012-11-27
 "91.238.214.0","91.238.215.255","1542379008","1542379519","GB","United Kingdom"
 
-# FR, because RIR delegation files say 176.31.0.0-176.31.255.255 is FR,
-# even though neither previous nor next MaxMind range is FR.  This may be
-# wrong, but we don't have any better information to say this range is ES
-# (previous range) or IT (next range), so sticking with RIR's FR.
-# -KL 2013-03-07
-"176.31.59.140","176.31.59.143","2954836876","2954836879","FR","France"
-
 # NL, because next MaxMind entry 176.56.173.0-176.56.173.63 is NL, and RIR
 # delegation files say 176.56.160.0-176.56.191.255 is NL.  -KL 2013-05-13
 "176.56.172.0","176.56.172.255","2956504064","2956504319","NL","Netherlands"
@@ -148,23 +118,12 @@
 # -KL 2012-11-27
 "176.67.86.0","176.67.87.255","2957202944","2957203455","US","United States"
 
-# FR, because next MaxMind entry 178.33.213.216-178.33.213.223 is FR, and
-# RIR delegation files say entire range 178.32.0.0-178.33.255.255 is FR.
-# -KL 2013-03-07
-"178.33.213.212","178.33.213.215","2988561876","2988561879","FR","France"
-
 # GB, because RIR delegation files say exactly this range
 # 185.25.84.0-185.25.87.255 is GB, even though neither previous nor next
 # MaxMind range is GB.  Both previous and next MaxMind ranges match RIR
 # delegation files, too.  -KL 2013-05-13
 "185.25.84.0","185.25.87.255","3105444864","3105445887","GB","United Kingdom"
 
-# GB, because RIR delegation files say exactly this range
-# 193.104.113.0-193.104.113.255 is GB, even though neither previous nor
-# next MaxMind range is GB.  Both previous and next MaxMind ranges match
-# RIR delegation files, too.  -KL 2013-03-07
-"193.104.113.0","193.104.113.255","3244847360","3244847615","GB","United Kingdom"
-
 # EU, despite neither previous (RU) nor next (UA) MaxMind entry being EU,
 # but because RIR delegation files agree with both previous and next
 # MaxMind entry and say EU for 193.200.150.0-193.200.150.255.
@@ -181,11 +140,6 @@
 # 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"
 
-# AU, because previous MaxMind entry 203.98.64.0-203.98.94.255 is AU, and
-# RIR delegation files say 203.98.82.0-203.98.95.255 is AU.
-# -KL 2013-05-13
-"203.98.95.0","203.98.95.255","3412221696","3412221951","AU","Australia"
-
 # 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
@@ -196,13 +150,6 @@
 # -KL 2012-11-27
 "209.59.32.0","209.59.63.255","3510312960","3510321151","US","United States"
 
-# GB, because RIR delegation files say 212.118.224.0-212.118.255.255 is
-# GB, even though neither previous nor next MaxMind range is GB.  This may
-# be wrong, but we don't have any better information to say this range is
-# CH (previous range) or US (next range), so sticking with RIR's GB.
-# -KL 2013-03-07
-"212.118.232.0","212.118.232.255","3564562432","3564562687","GB","United Kingdom"
-
 # EU, despite neither previous (RU) nor next (SE) MaxMind entry being EU,
 # but because RIR delegation files agree with previous MaxMind entry and
 # say EU for 217.15.160.0-217.15.175.255.  -KL 2013-05-13