aboutsummaryrefslogtreecommitdiff
path: root/src/config
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-02-08 10:37:34 -0500
committerNick Mathewson <nickm@torproject.org>2013-02-08 10:37:34 -0500
commitfd1c2a13e7558086732288eb1a4f52aef2edeb2f (patch)
tree195f613c7c509fde395a90f965a6e22fd632087c /src/config
parenta24f29ec5d761ecb13f59f84b5b0b42819c1de56 (diff)
parent7f805b60487d8a9bff2d93b7b3c655b7b45398e1 (diff)
downloadtor-fd1c2a13e7558086732288eb1a4f52aef2edeb2f.tar
tor-fd1c2a13e7558086732288eb1a4f52aef2edeb2f.tar.gz
Merge remote-tracking branch 'karsten/geoip-manual-update'
Diffstat (limited to 'src/config')
-rw-r--r--src/config/geoip-manual4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/config/geoip-manual b/src/config/geoip-manual
index 3811c75bf..99c897ff4 100644
--- a/src/config/geoip-manual
+++ b/src/config/geoip-manual
@@ -5,7 +5,9 @@
# Remove MaxMind entry 0.116.0.0-0.119.255.255 which MaxMind says is AT,
# but which is part of reserved range 0.0.0.0/8. -KL 2012-06-13
-"0.116.0.0","0.119.255.255","7602176","7864319","",""
+# Disabled, because MaxMind apparently removed this range from their
+# database. -KL 2013-02-08
+#"0.116.0.0","0.119.255.255","7602176","7864319","",""
# NL, because previous MaxMind entry 31.171.128.0-31.171.133.255 is NL,
# and RIR delegation files say 31.171.128.0-31.171.135.255 is NL.