overrides: Rename newcountry to country

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/country-overrides/override-a1.txt b/country-overrides/override-a1.txt
index 585982254ced846a4e38403faa1e3f72b7adbe18..e312de649037692d412fb4ec030bed37bf1b5e4e 100644 (file)
--- a/country-overrides/override-a1.txt
+++ b/country-overrides/override-a1.txt
@@ -14,979 +14,979 @@
 # Please note only long-living Tor relay providers with static IPs
 # are listed here, as the list of all Tor relays will be dynamically
 # generated by another script.
-# 
+#
 
 net:           5.62.0.0/22
 descr:         Privax LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           5.62.4.0/23
 descr:         Privax LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           5.62.6.0/23
 descr:         Privax LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           5.62.8.0/22
 descr:         Privax LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           5.62.12.0/22
 descr:         Privax LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           5.62.20.0/23
 descr:         Privax LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           5.62.22.0/23
 descr:         Privax LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           5.62.24.0/22
 descr:         Privax LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           5.62.28.0/22
 descr:         Privax LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           5.62.56.160/30
 descr:         Privax LTD/AVAST s.r.o.
 remarks:       VPN provider, fake location (KP)
-newcountry:    A1
+country:       A1
 
 net:           5.62.61.64/30
 descr:         Privax LTD/AVAST s.r.o.
 remarks:       VPN provider, fake location (KP)
-newcountry:    A1
+country:       A1
 
 net:           5.249.160.0/24
 descr:         VPNTunnel
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           5.254.133.0/23
 descr:         VPNTunnel
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           5.254.135.0/24
 descr:         VPNTunnel
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           5.254.139.0/21
 descr:         VPNTunnel
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           5.254.144.0/22
 descr:         VPNTunnel/HushyVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           5.254.148.0/22
 descr:         Anonine VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           5.254.152.0/21
 descr:         VPNTunnel
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           37.218.246.0/24
 descr:         Zwiebelfreunde e.V.
 remarks:       Tor relay provider
-newcountry:    A1
+country:       A1
 
 net:           37.230.128.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           37.230.130.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           37.230.168.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           37.230.170.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           37.230.172.0/22
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           37.230.176.0/22
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           37.230.180.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           37.230.185.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           37.230.186.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           37.230.191.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           45.41.133.0/24
 descr:         Blockless VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.36.200.0/22
 descr:         IAPS Security Services, L.L.C.
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           43.226.229.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           43.226.230.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           45.42.151.0/24
 descr:         Manpo ISP/OppoBox LLC/Roya Hosting
 remarks:       VPN provider [high confidence, but not proofed], fake location (KP)
-newcountry:    A1
+country:       A1
 
 net:           46.243.136.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.138.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.139.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.140.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.143.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.144.0/22
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.148.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.150.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.204.0/22
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.211.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.212.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.217.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.218.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.221.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.233.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.234.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.237.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.239.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.240.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.244.0/22
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.248.0/22
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.208.0/23
 descr:         PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.210.0/24
 descr:         PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.216.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           46.243.236.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           62.73.7.0/24
 descr:         Privax LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           62.73.8.0/23
 descr:         Privax LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           62.73.10.0/24
 descr:         Privax LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           62.149.160.0/20
 descr:         Aruba VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           62.205.133.0/24
 descr:         Netassist VPN service
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           62.205.152.0/24
 descr:         Netassist VPN service
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           64.64.108.0/24
 descr:         ExpressVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           64.64.123.0/24
 descr:         ExpressVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           64.145.67.0/24
 descr:         SecuredConnectivity
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           64.145.76.0/24
 descr:         SecuredConnectivity
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           64.145.79.0/24
 descr:         SecuredConnectivity
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           64.145.94.0/24
 descr:         SecuredConnectivity
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           77.247.80.0/21
 descr:         Sys11 VPN Services UG (haftungsbeschraenkt)
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           80.254.74.0/20
 descr:         Monzoon/SwissVPN
 remarks:       VPN provider [high confidence, but not proofed]
-newcountry:    A1
+country:       A1
 
 net:           82.199.130.0/24
 descr:         Perfect Privacy LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           82.199.141.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           85.195.160.0/23
 descr:         IP pool for limited VPN service/SatGate LLC
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           85.195.188.0/24
 descr:         P pool for limited VPN service/SatGate LLC
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           85.195.190.0/24
 descr:         P pool for limited VPN service/SatGate LLC
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           85.203.23.0/24
 descr:         VPN Consumer Network
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           85.203.39.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           87.119.203.0/24
 descr:         Privax LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           88.81.248.0/24
 descr:         TopNet ISP VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           94.199.160.0/23
 descr:         MIK Telecom VPN pool
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           95.192.58.0/24
 descr:         Azimut-R VPN Service
 remarks:       VPN provider [high confidence, but not proofed]
-newcountry:    A1
+country:       A1
 
 net:           95.129.59.0/24
 descr:         Azimut-R VPN Service
 remarks:       VPN provider [high confidence, but not proofed]
-newcountry:    A1
+country:       A1
 
 net:           91.238.214.0/23
 descr:         Privax LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           95.110.128.0/20
 descr:         Aruba VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           95.154.64.0/20
 descr:         Octopusnet VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           95.154.80.0/21
 descr:         Octopusnet VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           95.154.88.0/21
 descr:         Octopusnet VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           95.154.96.0/21
 descr:         Octopusnet VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           98.159.233.0/24
 descr:         Nobis Technology VPN Service
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           103.6.219.0/24
 descr:         Astrill VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           103.40.134.0/24
 descr:         Pruska VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           103.46.142.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           103.47.146.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           104.37.2.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           104.37.57.0/24
 descr:         Privax LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           104.143.84.0/24
 descr:         VPN Consumer Network
 remarks:       VPN Provider
-newcountry:    A1
+country:       A1
 
 net:           104.238.32.0/24
 descr:         Nobis Technology VPN Service
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           104.238.45.0/24
 descr:         Nobis Technology VPN Service
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           138.117.53.0/24
 descr:         Proxy Brazil/Global Flash Telecom
 remarks:       VPN provider [high confidence, but not proofed]
-newcountry:    A1
+country:       A1
 
 net:           141.101.134.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           141.101.143.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           141.101.148.0/22
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           141.101.152.0/22
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           141.101.156.0/22
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           141.101.160.0/21
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           141.101.168.0/22
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           141.101.172.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           141.101.174.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           154.0.24.0/24
 descr:         WIFI and PROXY NET/Atlantique Telecom
 remarks:       VPN provider [high confidence, but not proofed]
-newcountry:    A1
+country:       A1
 
 net:           154.16.139.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           172.94.73.0/24
 descr:         Secure Internet LLC
 remarks:       VPN provider [high confidence, same contact person as for GZ Systems Ltd., but not proofed]
-newcountry:    A1
+country:       A1
 
 net:           172.97.82.128/25
 descr:         Fiber Galaxy/Manpo ISP
 remarks:       VPN provider [high confidence, but not proofed], fake location (KP)
-newcountry:    A1
+country:       A1
 
 net:           173.239.207.0/24
 descr:         ExpressVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           173.244.42.0/24
 descr:         ExpressVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           173.244.55.0/24
 descr:         VPN Consumer Network (C05922486)/Logicweb
 remarks:       VPN provider [high confidence, but not proofed]
-newcountry:    A1
+country:       A1
 
 net:           173.245.202.0/23
 descr:         SecuredConnectivity
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           178.170.136.0/22
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           178.170.141.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           178.170.144.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           178.170.146.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           179.61.220.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           185.56.128.0/22
 descr:         Sys11 VPN Services UG (haftungsbeschraenkt)
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           185.56.163.144/28
 descr:         Easy Networks Solutions OU/VPNFacile
 remarks:       VPN provider [high confidence, but not proofed], fake location (KP)
-newcountry:    A1
+country:       A1
 
 net:           185.161.200.0/23
 descr:         ProtonVPN AG
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           185.198.240.0/24
 descr:         VPN Consumer Network Services/velia.net
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           185.220.101.0/24
 descr:         Zwiebelfreunde e.V.
 remarks:       Tor relay provider
-newcountry:    A1
+country:       A1
 
 net:           188.72.80.0/21
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           188.72.88.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           188.72.90.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           188.72.95.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           188.72.97.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           188.72.98.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           188.72.100.0/22
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           188.72.104.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           188.72.106.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           188.72.110.0/22
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           188.72.112.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           188.72.116.0/22
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           188.72.124.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           191.96.1.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           191.96.75.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           191.101.28.0/24
 descr:         ExpressVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           191.101.56.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           192.36.31.0/24
 descr:         Zwiebelfreunde e.V.
 remarks:       Tor relay provider
-newcountry:    A1
+country:       A1
 
 net:           192.36.41.0/24
 descr:         Zwiebelfreunde e.V.
 remarks:       Tor relay provider
-newcountry:    A1
+country:       A1
 
 net:           192.36.61.0/24
 descr:         Zwiebelfreunde e.V.
 remarks:       Tor relay provider
-newcountry:    A1
+country:       A1
 
 net:           192.230.37.0/24
 descr:         Privax LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           192.230.39.0/24
 descr:         Privax LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           192.241.169.122/32
 descr:         ssltunnel.net et al.
 remarks:       Open proxy provider
-newcountry:    A1
+country:       A1
 
 net:           193.150.8.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           193.150.10.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           193.200.150.0/24
 descr:         Anonymouse/Anonymous S.A.
 remarks:       VPN and open proxy provider
-newcountry:    A1
+country:       A1
 
 net:           194.68.32.0/24
 descr:         Zwiebelfreunde e.V.
 remarks:       Tor relay provider
-newcountry:    A1
+country:       A1
 
 net:           193.235.207.0/24
 descr:         Zwiebelfreunde e.V.
 remarks:       Tor relay provider
-newcountry:    A1
+country:       A1
 
 net:           194.132.208.0/24
 descr:         Zwiebelfreunde e.V.
 remarks:       Tor relay provider
-newcountry:    A1
+country:       A1
 
 net:           194.132.209.0/24
 descr:         Zwiebelfreunde e.V.
 remarks:       Tor relay provider
-newcountry:    A1
+country:       A1
 
 net:           195.138.249.0/24
 descr:         Perfect Privacy LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           196.29.162.0/24
 descr:         Canar VPN Range
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           196.29.165.0/24
 descr:         Canar VPN Range
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           199.38.234.0/24
 descr:         Privax LTD
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           205.185.193.0/24
 descr:         SecuredConnectivity
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           205.185.209.0/24
 descr:         SecuredConnectivity
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           205.185.214.0/24
 descr:         SecuredConnectivity
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           205.185.222.0/24
 descr:         SecuredConnectivity
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           205.185.223.0/24
 descr:         SecuredConnectivity
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           209.107.196.0/24
 descr:         SecuredConnectivity
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           209.107.204.0/24
 descr:         SecuredConnectivity
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           209.107.210.0/24
 descr:         SecuredConnectivity
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           209.107.214.0/24
 descr:         SecuredConnectivity
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           209.107.216.0/24
 descr:         SecuredConnectivity
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           209.222.240.0/23
 descr:         Castle VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           209.222.242.0/23
 descr:         Castle VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           209.222.244.0/23
 descr:         Castle VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           209.222.246.0/24
 descr:         Castle VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           209.222.246.0/23
 descr:         Castle VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           209.222.248.0/22
 descr:         Castle VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           209.222.252.0/22
 descr:         Castle VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           209.234.253.0/24
 descr:         SecuredConnectivity
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           212.120.8.0/24
 descr:         Netcetera VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           216.151.180.0/24
 descr:         SecuredConnectivity
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           216.151.183.0/24
 descr:         SecuredConnectivity
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           217.115.10.128/28
 descr:         Chaos Computer Club e.V.
 remarks:       Tor relay provider
-newcountry:    A1
+country:       A1
 
 net:           217.148.75.0/24
 descr:         ITNow S.A. VPN pool
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           217.148.76.0/24
 descr:         ITNow S.A. VPN pool
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           223.27.212.0/24
 descr:         Pruska VPN
 remarks:       VPN provider
-newcountry:    A1
+country:       A1
 
 net:           2a03:f85::/48
 descr:         Zwiebelfreunde e.V.
 remarks:       Tor relay provider
-newcountry:    A1
+country:       A1
 
 net:           2a03:f85:1::/48
 descr:         Zwiebelfreunde e.V.
 remarks:       Tor relay provider
-newcountry:    A1
+country:       A1
 
 net:           2a03:f85:2::/48
 descr:         Zwiebelfreunde e.V.
 remarks:       Tor relay provider
-newcountry:    A1
+country:       A1
 
 net:           2a03:f85:3::/48
 descr:         Zwiebelfreunde e.V.
 remarks:       Tor relay provider
-newcountry:    A1
+country:       A1
 
 net:           2a03:f85:4::/48
 descr:         Zwiebelfreunde e.V.
 remarks:       Tor relay provider
-newcountry:    A1
+country:       A1
 
 net:           2a03:f85:6::/48
 descr:         Zwiebelfreunde e.V.
 remarks:       Tor relay provider
-newcountry:    A1
+country:       A1
 
 net:           2a0b:f4c0:16c::/48
 descr:         Network for Tor-Exit traffic/F3 Netze e.V.
 remarks:       Tor relay provider
-newcountry:    A1
+country:       A1

diff --git a/country-overrides/override-a2.txt b/country-overrides/override-a2.txt
index 6cb25328db07cf4eafbcdf676e8a8f57333119f1..117179f1319b5e8ade395d9a361cce32570d9689 100644 (file)
--- a/country-overrides/override-a2.txt
+++ b/country-overrides/override-a2.txt
@@ -13,109 +13,109 @@
 net:           89.18.107.0/24
 descr:         Tooway B2C for satellite broadband usage
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           95.210.9.0/24
 descr:         IP COPTER - SATELLITE INFRASTRUCTURE
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           103.7.98.0/24
 descr:         Inmarsat Australia Pty Ltd
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           103.246.235.0/24
 descr:         Inmarsat Australia Pty Ltd
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           161.30.0.0/16
 descr:         Inmarsat
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           161.30.31.0/24
 descr:         Inmarsat
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           161.30.89.0/24
 descr:         Inmarsat
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           161.30.94.0/24
 descr:         Inmarsat
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           161.30.96.0/24
 descr:         Inmarsat
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           161.30.105.0/24
 descr:         Inmarsat
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           161.30.112.0/22
 descr:         Inmarsat
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           161.30.202.0/24
 descr:         Inmarsat
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           161.30.204.0/24
 descr:         Inmarsat
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           161.30.208.0/24
 descr:         Inmarsat
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           161.30.209.0/24
 descr:         Inmarsat
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           164.40.232.0/21
 descr:         EUSANET GmbH
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           185.10.92.0/22
 descr:         EUSANET GmbH
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           185.34.128.0/23
 descr:         For Viasat Satellite Modems/HKN GmbH
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           185.34.130.0/23
 descr:         For Viasat Satellite Modems/HKN GmbH
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           185.152.244.0/22
 descr:         Filiago GmbH und Co. KG
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           193.84.95.0/24
 descr:         EUSANET GmbH
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2
 
 net:           208.25.12.0/24
 descr:         Iridium North America
 remarks:       Satellite Internet provider
-newcountry:    A2
+country:       A2

diff --git a/country-overrides/override-other.txt b/country-overrides/override-other.txt
index edb88a32dae6afe4fcd68ba92a5c80b1e8adae4d..9269f2860590f8b21d783b762434dc18e3330713 100644 (file)
--- a/country-overrides/override-other.txt
+++ b/country-overrides/override-other.txt
@@ -18,56 +18,56 @@
 net:           10.0.0.0/8
 descr:         RFC1918 private address block
 remarks:       must not be added to the database
-newcountry:
+country:
 
 net:           172.16.0.0/12
 descr:         RFC1918 private address block
 remarks:       must not be added to the database
-newcountry:
+country:
 
 net:           192.168.0.0/16
 descr:         RFC1918 private address block
 remarks:       must not be added to the database
-newcountry:
+country:
 
 # never add other special address blocks
 net:           0.0.0.0/8
 descr:         RFC3232 current network alias
 remarks:       must not be added to the database
-newcountry:
+country:
 
 net:           100.64.0.0/10
 descr:         RFC6598 provider CNAT network
 remarks:       must not be added to the database
-newcountry:
+country:
 
 net:           127.0.0.0/8
 descr:         RFC3330 localnet
 remarks:       must not be added to the database
-newcountry:
+country:
 
 net:           169.254.0.0/16
 descr:         RFC5735 link-local address block
 remarks:       must not be added to the database
-newcountry:
+country:
 
 net:           224.0.0.0/4
 descr:         RFC3171 multicast network
 remarks:       must not be added to the database
-newcountry:
+country:
 
 net:           ::/128
 descr:         IPv6 address which must not assigned anywhere
 remarks:       must not be added to the database
-newcountry:
+country:
 
 net:           ::1/128
 descr:         IPv6 localhost address
 remarks:       must not be added to the database
-newcountry:
+country:
 
 # networks with faked location
 net:           88.151.117.0/24
 descr:         Golden Internet LLC
 remarks:       fake location (KP), WHOIS contact points to RU
-newcountry:    RU
+country:       RU