更新数据

2025-12-17 23:34:35 +08:00 · 2025-02-06 17:10:28 +08:00
parent 488bc4e3bb
commit ef46c586ee
88 changed files with 542 additions and 14224 deletions
--- a/data/cncity/100000.txt
+++ b/data/cncity/100000.txt
@@ -3261,7 +3261,12 @@
 223.120.64.0/18
 223.120.128.0/17
 223.121.0.0/16
-223.122.0.0/15
+223.122.0.0/20
 223.122.18.0/23
 223.122.20.0/22
 223.122.26.0/23
 223.122.28.0/22
 223.123.0.0/16
 223.124.0.0/14
 223.128.176.0/20
 223.128.192.0/18
--- a/data/cncity/130000.txt
+++ b/data/cncity/130000.txt
@@ -670,6 +670,7 @@
 59.67.224.0/20
 59.67.240.0/21
 59.81.16.0/23
 59.82.120.0/23
 59.108.153.224/28
 60.0.0.0/14
 60.4.0.0/16
--- a/data/cncity/130700.txt
+++ b/data/cncity/130700.txt
@@ -2,6 +2,7 @@
 42.247.5.200/29
 42.247.46.224/28
 42.247.75.248/29
 59.82.120.0/23
 116.251.84.180/30
 116.251.84.184/29
 116.251.84.192/28
--- a/data/cncity/140300.txt
+++ b/data/cncity/140300.txt
@@ -1,62 +0,0 @@
 1.70.243.0/24
 1.70.245.0/24
 39.134.27.96/27
 39.134.30.0/27
 39.137.19.96/27
 39.137.21.96/27
 39.144.97.0/24
 59.48.210.0/23
 59.48.212.0/22
 59.48.216.0/21
 59.48.224.0/24
 60.222.215.0/24
 61.240.58.0/23
 110.180.0.0/17
 113.24.0.0/17
 113.24.226.0/24
 113.26.139.0/24
 116.179.32.0/23
 116.179.34.0/24
 116.179.37.0/32
 118.80.0.0/16
 120.208.194.0/23
 120.208.196.0/22
 124.166.0.0/17
 124.166.128.0/18
 124.166.192.0/19
 124.166.224.0/20
 124.166.240.0/22
 124.166.245.0/24
 124.166.246.0/23
 124.166.248.0/21
 171.119.0.0/18
 183.187.146.0/24
 183.200.192.0/20
 183.202.96.0/21
 183.202.224.0/21
 202.99.201.0/24
 202.99.215.0/24
 210.82.250.0/24
 211.142.48.0/22
 211.142.52.0/23
 211.146.119.0/26
 211.146.119.101/32
 211.146.119.102/31
 211.146.119.104/29
 211.146.119.112/28
 218.26.30.62/32
 218.26.48.0/23
 218.26.50.0/24
 218.26.158.0/24
 218.26.201.0/24
 218.26.202.0/23
 219.147.39.0/24
 219.147.40.0/24
 219.149.143.0/25
 219.149.189.0/24
 221.131.26.0/24
 222.37.12.0/24
 222.37.122.0/23
 222.37.124.0/22
 222.37.128.0/23
 222.37.130.0/24
--- a/data/cncity/140800.txt
+++ b/data/cncity/140800.txt
@@ -1,196 +0,0 @@
 1.69.128.0/18
 1.71.192.0/18
 39.134.26.128/27
 39.134.27.192/28
 39.134.28.128/26
 39.137.18.128/27
 39.137.20.128/27
 59.48.139.0/24
 59.48.140.0/22
 59.48.144.0/21
 59.48.152.0/22
 59.48.156.0/23
 59.48.158.0/24
 59.49.124.0/24
 59.49.127.0/24
 60.222.0.0/17
 60.222.128.0/18
 60.222.192.0/20
 60.222.208.0/22
 60.222.212.0/23
 60.222.214.0/24
 60.222.216.0/21
 60.222.224.0/19
 61.237.159.6/32
 61.237.159.25/32
 61.240.50.0/23
 61.240.52.0/22
 111.53.69.0/24
 111.53.70.0/23
 113.27.112.0/23
 113.27.114.0/24
 115.24.28.0/22
 118.78.0.0/17
 118.78.128.0/18
 118.78.192.0/19
 118.78.224.0/23
 118.78.226.0/24
 118.78.228.0/22
 118.78.232.0/21
 118.78.240.0/20
 120.208.7.0/24
 121.100.145.0/24
 121.100.238.0/24
 123.73.48.0/20
 123.174.0.0/18
 123.174.67.0/24
 123.174.68.0/22
 123.174.72.0/21
 123.174.80.0/24
 123.174.111.0/24
 123.174.112.0/22
 123.174.116.0/23
 123.174.118.0/24
 123.174.130.0/23
 123.174.132.0/22
 123.174.136.0/22
 123.174.144.0/24
 123.174.177.0/24
 123.174.178.0/23
 123.174.180.0/22
 123.174.184.0/21
 123.174.192.0/18
 171.122.0.0/17
 171.122.128.0/18
 171.122.192.0/19
 171.122.224.0/20
 171.122.240.0/21
 171.122.248.0/22
 171.122.252.0/23
 171.122.255.0/24
 171.125.192.0/18
 182.127.150.0/24
 183.190.0.0/16
 183.191.0.0/18
 183.191.64.0/21
 183.191.72.0/24
 183.191.74.0/23
 183.191.76.0/22
 183.191.80.0/20
 183.191.96.0/19
 183.191.128.0/19
 183.191.160.0/20
 183.191.176.0/21
 183.191.184.0/24
 183.191.186.0/23
 183.191.188.0/22
 183.191.192.0/18
 183.200.96.0/19
 183.202.48.0/20
 183.202.176.0/20
 183.203.192.0/18
 202.97.153.0/24
 202.99.204.0/24
 202.99.213.0/24
 202.207.232.0/22
 203.93.113.192/26
 210.12.35.0/24
 211.93.165.32/32
 211.93.166.71/32
 211.142.90.0/23
 211.142.92.0/22
 211.146.119.128/26
 218.26.21.0/27
 218.26.21.32/30
 218.26.21.36/31
 218.26.21.39/32
 218.26.21.40/29
 218.26.21.48/28
 218.26.21.64/26
 218.26.21.128/25
 218.26.22.0/27
 218.26.22.32/28
 218.26.22.48/30
 218.26.22.52/32
 218.26.22.54/31
 218.26.22.56/30
 218.26.22.61/32
 218.26.22.62/31
 218.26.22.64/26
 218.26.22.128/25
 218.26.23.0/24
 218.26.38.0/24
 218.26.56.0/23
 218.26.58.0/24
 218.26.59.45/32
 218.26.59.232/32
 218.26.77.47/32
 218.26.77.60/32
 218.26.78.0/25
 218.26.78.128/26
 218.26.78.192/28
 218.26.78.208/29
 218.26.78.216/31
 218.26.78.219/32
 218.26.78.220/30
 218.26.78.224/30
 218.26.78.228/31
 218.26.78.230/32
 218.26.78.232/29
 218.26.78.240/28
 218.26.79.0/26
 218.26.79.64/31
 218.26.79.67/32
 218.26.79.68/30
 218.26.79.72/29
 218.26.79.80/28
 218.26.79.96/28
 218.26.79.112/30
 218.26.79.116/32
 218.26.79.119/32
 218.26.79.120/30
 218.26.79.125/32
 218.26.79.126/31
 218.26.79.128/28
 218.26.79.144/30
 218.26.79.148/31
 218.26.79.150/32
 218.26.79.152/29
 218.26.79.160/27
 218.26.79.192/26
 218.26.183.0/24
 218.26.220.0/22
 218.26.249.0/24
 218.26.250.0/24
 219.147.35.0/24
 219.147.45.0/24
 219.147.47.0/24
 219.149.141.128/25
 219.149.180.0/22
 220.194.170.0/23
 220.194.172.0/23
 220.194.174.0/26
 220.194.174.64/30
 220.194.174.68/32
 221.131.58.134/32
 221.131.58.138/32
 221.131.58.142/32
 221.131.60.214/32
 221.131.61.90/31
 221.131.61.92/30
 221.131.61.96/30
 221.131.61.100/31
 222.31.8.0/21
 222.31.24.0/21
 222.37.0.0/24
 222.37.11.0/24
 222.37.32.0/24
 222.37.56.0/24
 222.37.88.0/24
 222.37.93.0/24
 222.37.94.0/23
 222.37.169.0/24
 222.37.239.0/24
 222.199.4.0/24
 222.199.23.0/24
 223.13.128.0/17
--- a/data/cncity/220600.txt
+++ b/data/cncity/220600.txt
@@ -1,281 +0,0 @@
 39.134.160.224/28
 39.134.161.224/28
 39.134.163.224/28
 39.134.164.224/28
 39.134.166.128/27
 39.137.83.224/28
 58.21.160.0/21
 58.21.176.0/20
 61.138.156.0/24
 61.138.158.0/24
 61.161.25.0/24
 61.161.26.0/23
 61.161.28.0/22
 61.161.32.0/23
 61.232.168.96/28
 61.232.172.192/26
 61.243.231.127/32
 61.243.231.128/26
 61.243.231.192/28
 61.243.231.208/29
 61.243.231.216/30
 61.243.231.220/32
 61.243.254.0/23
 106.41.128.0/19
 106.41.160.0/22
 106.41.164.0/23
 106.41.167.0/24
 106.41.168.0/21
 106.41.176.0/20
 110.127.0.0/18
 110.127.64.0/19
 110.127.96.0/20
 110.127.116.0/22
 110.127.120.0/21
 119.55.192.0/18
 121.70.41.0/24
 121.70.42.0/24
 122.69.192.0/24
 122.138.128.0/18
 122.138.192.0/22
 122.138.196.0/23
 122.140.64.0/18
 122.143.204.0/22
 122.143.208.0/20
 122.143.224.0/20
 122.143.240.0/22
 122.143.244.0/23
 122.143.247.0/24
 122.143.248.0/21
 123.78.96.0/21
 123.78.104.0/23
 123.172.180.0/24
 123.172.188.0/24
 123.172.192.0/22
 124.235.70.0/24
 139.214.0.0/21
 139.214.8.0/22
 175.18.88.0/21
 175.18.96.0/19
 175.21.232.0/21
 175.23.192.0/18
 175.30.240.0/20
 175.48.192.0/19
 175.48.228.0/22
 175.48.232.0/21
 175.48.240.0/20
 202.98.28.0/24
 202.111.171.128/28
 211.93.79.0/26
 211.93.79.64/27
 211.93.79.96/28
 211.93.79.112/30
 211.93.79.116/31
 211.93.79.118/32
 211.93.79.120/29
 211.93.79.128/27
 211.93.79.160/28
 211.93.79.176/32
 211.93.79.178/31
 211.93.79.181/32
 211.93.79.182/31
 211.93.79.184/29
 211.93.79.192/27
 211.93.79.224/30
 211.93.79.228/31
 211.93.79.231/32
 211.93.79.232/29
 211.93.79.240/28
 211.137.208.0/24
 211.141.32.0/23
 211.141.34.0/24
 211.141.36.0/22
 211.141.48.0/22
 211.141.52.0/25
 211.141.52.128/31
 211.141.52.130/32
 211.141.52.133/32
 211.141.52.134/31
 211.141.52.136/29
 211.141.52.144/29
 211.141.52.152/31
 211.141.52.154/32
 211.141.52.156/30
 211.141.52.160/31
 211.141.52.163/32
 211.141.52.164/30
 211.141.52.168/29
 211.141.52.176/28
 211.141.52.192/31
 211.141.52.196/30
 211.141.52.200/31
 211.141.52.203/32
 211.141.52.204/30
 211.141.52.208/29
 211.141.52.216/31
 211.141.52.218/32
 211.141.52.220/30
 211.141.52.224/29
 211.141.52.232/31
 211.141.52.235/32
 211.141.52.236/30
 211.141.52.240/30
 211.141.52.245/32
 211.141.52.246/31
 211.141.52.248/29
 211.141.53.0/25
 211.141.53.128/26
 211.141.53.192/31
 211.141.53.195/32
 211.141.53.196/30
 211.141.53.200/29
 211.141.53.208/28
 211.141.53.224/27
 211.141.54.0/31
 211.141.54.4/30
 211.141.54.8/31
 211.141.54.11/32
 211.141.54.12/30
 211.141.54.16/31
 211.141.54.21/32
 211.141.54.22/31
 211.141.54.24/29
 211.141.54.32/29
 211.141.54.40/30
 211.141.54.45/32
 211.141.54.46/31
 211.141.54.48/28
 211.141.54.64/28
 211.141.54.80/30
 211.141.54.84/32
 211.141.54.86/32
 211.141.54.88/29
 211.141.54.96/27
 211.141.54.128/25
 211.141.55.0/28
 211.141.55.16/31
 211.141.55.20/30
 211.141.55.24/31
 211.141.55.28/30
 211.141.55.32/30
 211.141.55.39/32
 211.141.55.41/32
 211.141.55.42/31
 211.141.55.44/32
 211.141.55.46/31
 211.141.55.48/31
 211.141.55.51/32
 211.141.55.52/30
 211.141.55.56/30
 211.141.55.60/31
 211.141.55.63/32
 211.141.55.64/30
 211.141.55.68/31
 211.141.55.71/32
 211.141.55.72/32
 211.141.55.74/31
 211.141.55.76/30
 211.141.55.80/31
 211.141.79.0/24
 218.27.190.0/23
 218.27.192.0/23
 218.27.207.184/32
 218.27.220.0/22
 218.27.224.0/23
 218.27.250.0/23
 218.27.255.0/24
 218.62.100.86/32
 218.62.120.0/24
 218.62.121.0/26
 218.62.121.64/30
 218.62.121.68/32
 218.62.121.70/31
 218.62.121.72/29
 218.62.121.83/32
 218.62.121.84/30
 218.62.121.88/31
 218.62.121.91/32
 218.62.121.92/32
 218.62.121.98/31
 218.62.121.100/30
 218.62.121.104/29
 218.62.121.112/28
 218.62.121.128/25
 218.62.122.0/23
 218.62.124.0/22
 219.150.4.0/24
 219.150.5.0/26
 219.150.5.64/28
 219.150.5.80/32
 219.150.6.114/32
 219.150.7.0/26
 219.150.7.64/27
 219.150.7.96/28
 219.150.7.113/32
 219.150.7.114/31
 219.150.7.116/30
 219.150.7.120/29
 219.150.7.128/25
 219.150.24.57/32
 219.150.24.58/31
 219.150.24.60/30
 219.150.24.64/26
 219.150.24.128/29
 219.150.24.137/32
 219.150.24.138/31
 219.150.24.140/30
 219.150.24.144/28
 219.150.24.160/27
 219.150.24.192/26
 219.150.25.0/24
 219.150.26.0/23
 221.8.240.0/21
 221.8.248.0/24
 221.8.249.167/32
 221.8.249.168/29
 221.8.249.176/28
 221.8.249.192/26
 221.8.250.0/24
 221.8.251.14/31
 221.8.251.16/28
 221.8.251.32/27
 221.8.251.64/26
 221.8.251.128/25
 221.8.252.0/24
 221.8.253.0/28
 221.8.253.16/30
 221.8.253.20/31
 221.8.253.23/32
 221.8.253.24/29
 221.8.253.32/27
 221.8.253.64/26
 221.8.253.128/25
 222.34.100.0/24
 222.34.102.0/23
 222.161.114.0/23
 222.161.116.0/22
 222.162.0.0/21
 222.162.8.0/22
 222.162.13.0/24
 222.162.14.0/23
 222.162.16.0/20
 222.162.32.0/19
 222.162.64.0/22
 222.162.68.0/23
 222.162.70.134/32
 222.162.70.195/32
 222.162.70.200/31
 222.162.70.202/32
 222.162.142.0/24
 222.163.25.0/24
 222.163.26.0/23
 222.163.225.0/24
 222.163.226.0/23
 222.163.228.0/22
 222.163.232.0/21
 222.163.240.0/20
 222.169.144.0/20
 222.169.160.0/20
 222.169.176.0/22
 222.169.180.0/23
 222.169.182.0/24
--- a/data/cncity/220800.txt
+++ b/data/cncity/220800.txt
@@ -1,132 +0,0 @@
 36.97.0.0/18
 36.104.64.0/18
 39.134.160.240/28
 39.134.161.240/28
 39.134.163.240/28
 39.134.164.240/28
 39.134.166.160/27
 39.137.83.240/28
 58.21.168.0/21
 58.21.192.0/18
 58.155.172.0/22
 61.138.168.0/23
 61.138.170.0/24
 61.161.52.0/24
 61.235.54.0/24
 61.235.58.0/24
 61.243.252.0/23
 119.52.141.0/24
 119.52.142.0/23
 119.52.144.0/21
 119.52.152.0/22
 119.52.156.0/23
 119.52.158.0/24
 119.52.164.0/22
 119.52.168.0/21
 119.52.176.0/20
 119.55.0.0/18
 119.55.185.0/24
 122.69.171.0/24
 122.69.172.0/24
 122.138.198.0/23
 122.138.200.0/21
 122.138.208.0/20
 122.138.224.0/19
 122.143.37.0/24
 122.143.38.0/23
 122.143.40.0/21
 122.143.48.0/21
 122.143.56.0/23
 122.143.58.0/24
 122.143.128.0/18
 123.78.192.0/19
 123.172.196.0/22
 123.172.200.0/21
 123.172.208.0/20
 123.172.224.0/21
 123.172.232.0/23
 123.172.236.0/22
 123.172.240.0/20
 125.223.160.0/22
 139.209.64.0/19
 139.209.192.0/19
 139.211.64.0/19
 139.211.160.0/19
 139.213.216.0/21
 139.214.16.0/21
 139.214.64.0/20
 139.214.192.0/22
 139.214.196.0/23
 175.23.64.0/18
 175.48.160.0/22
 175.48.164.0/23
 175.48.166.0/24
 202.111.171.160/28
 211.141.76.0/24
 218.27.12.0/22
 218.27.104.221/32
 218.27.114.0/23
 218.27.116.0/23
 218.27.118.0/24
 218.27.119.0/26
 218.27.119.64/28
 218.27.119.80/29
 218.27.119.88/31
 218.27.119.90/32
 218.27.120.0/22
 218.62.60.0/24
 218.62.61.0/25
 218.62.61.128/29
 218.62.61.136/30
 218.62.61.140/31
 218.62.61.143/32
 218.62.61.144/28
 218.62.61.160/27
 218.62.61.192/26
 218.62.62.0/23
 219.150.16.150/32
 219.150.18.18/32
 219.150.18.86/32
 219.150.18.182/32
 219.150.19.226/32
 219.150.19.242/32
 219.150.19.246/32
 220.201.180.0/24
 220.201.185.0/24
 220.201.186.0/23
 220.201.188.0/22
 221.8.104.0/21
 221.9.168.0/23
 221.9.170.0/26
 221.9.170.64/27
 221.9.170.96/28
 221.9.170.112/29
 221.9.170.120/30
 221.9.170.124/31
 221.9.170.127/32
 221.9.170.128/25
 221.9.171.0/24
 221.9.172.0/23
 221.9.174.0/24
 222.34.64.0/23
 222.160.192.0/20
 222.160.208.0/21
 222.160.216.0/29
 222.160.216.8/30
 222.160.216.12/31
 222.160.216.15/32
 222.160.216.16/28
 222.160.216.32/27
 222.160.216.64/26
 222.160.216.128/25
 222.160.217.0/24
 222.160.218.0/23
 222.160.220.0/22
 222.160.224.0/20
 222.161.120.0/21
 222.163.128.0/19
 222.163.160.0/20
 222.163.176.0/22
 222.163.180.0/23
 222.169.112.0/20
 222.169.128.0/20
--- a/data/cncity/230500.txt
+++ b/data/cncity/230500.txt
@@ -1,119 +0,0 @@
 1.57.128.0/18
 1.188.32.0/20
 1.188.48.0/21
 1.188.56.0/22
 1.188.60.0/24
 1.191.128.0/19
 1.191.160.0/20
 1.191.176.0/22
 1.191.181.0/24
 1.191.183.0/24
 1.191.184.0/21
 60.218.224.0/19
 61.138.20.110/32
 61.138.20.170/32
 61.138.28.0/24
 61.138.58.0/24
 61.158.17.0/24
 61.158.18.0/24
 61.158.29.118/32
 61.158.89.0/24
 61.167.101.0/24
 61.167.103.0/24
 61.167.104.0/22
 61.167.167.0/24
 61.167.236.70/32
 61.180.212.0/23
 61.180.235.0/25
 61.180.235.128/26
 61.180.235.192/30
 61.180.235.197/32
 61.180.235.198/31
 61.180.235.200/29
 61.180.235.208/28
 61.180.235.224/27
 61.180.236.0/23
 61.243.206.0/23
 112.98.192.0/20
 112.101.192.0/21
 112.101.200.0/23
 112.101.202.0/24
 113.1.98.0/23
 113.1.100.0/22
 113.1.104.0/21
 113.1.112.0/20
 113.5.102.0/23
 113.5.104.0/21
 113.5.112.0/21
 113.5.120.0/22
 113.5.124.0/23
 113.5.192.0/23
 113.5.194.0/24
 113.5.205.0/24
 113.5.206.0/23
 113.5.208.0/24
 113.5.220.0/22
 113.5.224.0/23
 113.5.227.0/24
 113.5.228.0/22
 113.5.232.0/21
 113.5.240.0/21
 113.5.248.0/23
 113.5.252.0/25
 113.5.252.128/26
 113.5.252.192/27
 113.5.252.224/28
 113.5.252.240/29
 113.5.252.248/30
 113.5.252.252/31
 113.5.252.254/32
 113.6.0.0/22
 113.6.4.0/23
 113.6.6.0/24
 113.6.8.0/21
 113.6.96.0/20
 113.6.112.0/21
 113.6.120.0/22
 113.6.124.0/23
 113.8.32.0/20
 113.8.48.0/21
 113.8.56.0/22
 113.8.60.0/24
 122.64.90.0/23
 122.64.92.0/23
 122.64.94.0/24
 122.156.0.0/19
 122.158.231.0/24
 122.158.232.0/21
 122.158.240.0/20
 123.164.196.0/24
 218.7.195.0/25
 218.7.195.128/28
 218.7.195.144/30
 218.7.195.149/32
 218.7.195.150/32
 218.7.195.152/29
 218.7.195.160/27
 218.7.195.192/26
 218.7.200.0/22
 218.7.204.0/25
 218.7.204.128/26
 218.7.204.192/27
 218.7.204.224/28
 218.7.204.240/32
 218.7.204.244/30
 218.7.204.248/29
 218.7.205.0/24
 218.7.207.0/24
 218.7.252.0/22
 218.8.188.0/23
 218.10.28.0/24
 218.10.105.0/24
 218.10.182.0/23
 219.147.66.0/32
 219.147.231.0/24
 219.147.232.0/23
 221.210.192.0/19
 222.32.132.0/22
 222.57.216.0/22
 222.170.192.0/20
--- a/data/cncity/231100.txt
+++ b/data/cncity/231100.txt
@@ -1,151 +0,0 @@
 1.60.8.0/21
 1.60.16.0/20
 1.60.32.0/19
 1.188.0.0/19
 1.191.192.0/20
 1.191.208.0/21
 1.191.216.0/23
 1.191.219.0/24
 1.191.220.0/22
 1.191.224.0/19
 60.11.128.0/20
 60.11.144.0/22
 60.11.148.0/24
 60.11.149.0/26
 60.11.149.64/28
 60.11.149.80/30
 60.11.149.84/31
 60.11.149.87/32
 60.11.149.88/29
 60.11.149.96/27
 60.11.149.128/25
 60.11.150.0/23
 60.11.152.0/21
 60.11.160.0/19
 60.11.192.0/24
 61.138.36.0/23
 61.158.14.0/23
 61.158.33.10/32
 61.158.33.255/32
 61.158.95.0/24
 61.158.101.0/25
 61.158.101.128/26
 61.158.101.192/28
 61.158.101.208/29
 61.158.101.216/30
 61.158.101.220/32
 61.158.101.222/31
 61.158.101.224/27
 61.158.102.0/23
 61.167.88.0/22
 61.167.96.0/23
 61.167.99.0/24
 61.167.187.0/24
 61.167.188.0/24
 61.167.240.0/24
 61.180.134.0/23
 61.180.136.0/24
 61.180.153.96/27
 61.180.153.128/28
 61.180.153.144/29
 61.180.153.152/30
 61.180.153.156/32
 61.180.177.162/31
 61.180.177.164/30
 61.180.177.168/29
 61.180.177.176/29
 61.180.177.184/30
 61.180.177.188/31
 61.180.177.190/32
 61.180.220.0/23
 61.236.111.0/24
 61.237.194.0/24
 61.243.194.0/24
 112.98.224.0/20
 112.101.233.0/24
 112.101.234.0/23
 113.3.3.0/24
 113.3.4.0/22
 113.3.14.0/24
 113.5.195.0/24
 113.5.196.0/22
 113.5.200.0/22
 113.5.204.0/24
 113.8.80.0/21
 113.8.88.0/22
 113.8.92.0/24
 113.8.160.0/19
 122.156.128.0/18
 123.164.224.0/21
 123.164.232.0/22
 123.164.236.0/24
 202.97.252.80/28
 202.97.252.96/27
 202.97.252.160/27
 218.7.224.0/22
 218.7.228.0/23
 218.7.230.0/24
 218.7.232.0/23
 218.7.234.0/24
 218.7.235.139/32
 218.7.235.140/30
 218.7.235.144/28
 218.7.235.160/29
 218.7.235.168/31
 218.7.235.172/30
 218.7.235.176/31
 218.7.235.179/32
 218.7.235.180/30
 218.7.235.184/29
 218.7.235.192/28
 218.7.235.208/29
 218.7.235.216/31
 218.7.235.219/32
 218.7.235.220/30
 218.7.235.224/31
 218.7.235.227/32
 218.7.235.228/30
 218.7.235.232/29
 218.7.235.240/28
 218.9.49.139/32
 218.9.93.0/24
 218.9.94.0/23
 218.9.137.0/24
 218.9.213.0/24
 218.9.214.0/24
 218.10.193.0/28
 218.10.193.16/29
 218.10.193.24/32
 218.10.193.26/31
 218.10.193.28/30
 218.10.193.32/27
 218.10.193.64/26
 218.10.193.128/25
 218.10.194.0/23
 218.10.200.222/32
 218.10.201.0/24
 218.10.202.0/23
 218.10.208.0/22
 218.10.212.0/23
 218.10.214.0/24
 219.147.237.0/24
 219.147.238.0/23
 219.147.251.0/24
 221.211.128.0/18
 222.27.129.0/24
 222.32.56.0/22
 222.32.60.0/23
 222.32.63.0/24
 222.56.176.0/21
 222.56.184.0/23
 222.56.187.0/24
 222.57.220.0/22
 222.170.187.0/24
 222.170.224.0/20
 222.172.32.74/32
 222.172.32.90/32
 222.172.32.218/32
 222.172.32.242/32
 222.172.38.0/24
 222.172.67.0/24
 222.172.68.0/24
--- a/data/cncity/330000.txt
+++ b/data/cncity/330000.txt
@@ -873,7 +873,13 @@
 58.100.0.0/15
 58.195.248.0/21
 58.205.200.0/21
-59.82.0.0/16
+59.82.0.0/18
 59.82.64.0/19
 59.82.96.0/20
 59.82.112.0/21
 59.82.122.0/23
 59.82.124.0/22
 59.82.128.0/17
 59.111.0.0/16
 60.12.0.0/20
 60.12.16.0/22
--- a/data/cncity/360600.txt
+++ b/data/cncity/360600.txt
@@ -1,113 +0,0 @@
 39.160.160.0/20
 39.167.64.0/20
 39.167.144.0/20
 39.167.232.0/21
 39.169.120.0/21
 39.179.40.0/21
 39.179.112.0/20
 39.179.248.0/21
 58.17.88.0/23
 58.17.90.0/24
 59.62.80.0/20
 59.62.96.0/19
 61.131.178.0/23
 61.131.230.0/24
 61.131.251.0/24
 61.180.56.0/21
 61.233.220.0/24
 61.233.230.0/23
 61.235.21.0/24
 61.235.22.0/23
 61.242.152.0/24
 111.72.192.0/18
 111.74.188.0/24
 111.78.189.0/24
 111.78.190.0/23
 111.78.192.0/19
 111.78.224.0/22
 111.78.228.0/23
 111.78.230.0/24
 113.194.125.0/24
 113.194.126.0/23
 113.195.240.0/20
 115.148.192.0/19
 115.148.224.0/23
 115.153.150.0/24
 117.40.214.0/23
 117.40.216.0/22
 117.43.32.0/20
 117.43.48.0/23
 117.43.59.0/24
 117.43.60.0/22
 117.136.127.0/24
 120.203.207.0/24
 120.203.208.0/21
 122.93.145.0/24
 122.93.146.0/23
 182.87.0.0/18
 182.98.64.0/24
 182.99.96.0/23
 182.100.248.0/21
 182.110.240.0/24
 183.217.250.0/23
 183.217.252.0/22
 183.219.98.0/23
 183.219.100.0/22
 183.219.104.0/23
 202.101.235.0/24
 202.101.242.0/24
 202.109.128.0/24
 202.109.146.0/23
 202.109.148.0/22
 202.109.155.0/24
 202.109.158.0/23
 202.109.173.0/24
 202.109.174.0/24
 202.109.176.0/24
 202.109.185.0/24
 211.98.51.64/27
 211.141.153.0/24
 211.141.154.0/23
 211.141.156.0/24
 211.146.92.0/24
 218.64.224.0/28
 218.64.224.16/29
 218.64.224.24/30
 218.64.224.28/31
 218.64.224.30/31
 218.64.224.32/27
 218.64.224.64/26
 218.64.224.128/25
 218.64.225.0/24
 218.64.226.0/23
 218.64.228.0/22
 218.64.232.0/21
 218.64.240.0/21
 218.65.72.0/23
 218.65.74.0/25
 218.65.74.128/26
 218.65.74.192/27
 218.65.74.224/28
 218.65.74.240/29
 218.65.74.248/31
 218.65.74.250/31
 218.65.74.252/30
 218.65.75.0/24
 218.87.176.0/20
 218.87.240.0/21
 218.95.104.0/24
 218.95.108.0/22
 218.204.124.0/22
 220.176.232.0/21
 220.176.240.0/20
 220.177.124.0/24
 220.177.212.0/22
 222.49.4.0/24
 222.49.106.0/23
 222.204.125.0/24
 223.82.162.0/23
 223.82.164.0/22
 223.82.168.0/23
 223.82.228.0/22
 223.82.232.0/21
 223.82.240.0/22
--- a/data/cncity/360900.txt
+++ b/data/cncity/360900.txt
@@ -1,208 +0,0 @@
 36.134.81.0/24
 39.134.118.0/24
 39.135.138.0/24
 39.160.16.0/20
 39.168.80.0/21
 39.169.160.0/19
 39.176.0.0/18
 39.178.80.0/20
 39.178.240.0/20
 39.179.232.0/21
 39.179.240.0/21
 58.17.70.0/24
 58.17.72.0/21
 59.62.160.0/19
 59.62.192.0/18
 60.200.36.0/22
 60.200.40.0/21
 60.200.48.0/20
 60.200.64.0/18
 61.131.145.0/24
 61.131.146.0/23
 61.131.148.0/23
 61.131.180.0/24
 61.131.207.0/24
 61.131.208.0/22
 61.131.212.0/23
 61.131.252.0/24
 61.180.1.0/24
 61.180.24.0/21
 61.233.209.0/24
 61.233.241.0/24
 61.233.242.0/24
 61.242.158.0/24
 106.5.224.0/19
 106.6.60.0/23
 106.226.58.0/23
 106.226.60.0/22
 111.72.128.0/18
 111.77.192.0/19
 111.77.224.0/23
 111.77.226.0/24
 111.79.192.0/19
 111.79.224.0/22
 111.79.228.0/23
 113.194.62.0/24
 115.151.0.0/18
 115.153.0.0/21
 115.153.8.0/22
 115.153.12.0/23
 115.153.15.0/24
 115.153.16.0/20
 115.153.32.0/20
 115.153.48.0/22
 115.153.52.0/23
 115.153.55.0/24
 115.153.88.0/21
 115.153.96.0/19
 115.153.128.0/22
 115.153.151.0/24
 115.153.152.0/21
 115.153.160.0/20
 115.153.177.0/24
 115.153.178.0/23
 115.153.183.0/24
 115.153.184.0/21
 115.153.192.0/18
 117.21.67.0/24
 117.21.68.0/22
 117.21.72.0/21
 117.21.80.0/21
 117.21.88.0/23
 117.21.168.0/23
 117.40.252.0/23
 117.40.254.0/25
 117.40.254.128/28
 117.40.254.145/32
 117.40.254.146/31
 117.40.254.148/30
 117.40.254.152/29
 117.40.254.160/27
 117.40.254.192/26
 117.40.255.0/24
 117.42.192.0/18
 117.166.50.0/23
 117.166.52.0/22
 120.203.124.0/22
 120.203.128.0/22
 120.203.132.0/23
 120.203.228.0/22
 120.203.232.0/21
 120.203.240.0/24
 122.93.77.0/24
 122.93.78.0/23
 122.93.80.0/20
 122.93.96.0/22
 122.93.100.0/23
 122.93.102.0/24
 122.93.104.0/24
 182.99.207.0/24
 182.99.208.0/20
 182.100.240.0/21
 182.101.229.0/24
 182.101.230.0/23
 182.101.232.0/21
 182.101.240.0/21
 182.102.129.0/24
 182.102.130.0/23
 182.102.132.0/22
 182.102.136.0/21
 182.102.144.0/20
 182.102.160.0/20
 182.102.176.0/24
 182.102.178.0/23
 182.102.180.0/22
 182.102.184.0/21
 182.105.127.0/24
 182.105.247.0/24
 182.107.96.0/19
 182.109.192.0/18
 182.110.64.0/19
 182.110.96.0/24
 182.110.98.0/23
 182.110.100.0/22
 182.110.104.0/21
 182.110.112.0/20
 182.110.128.0/21
 182.110.136.0/22
 182.110.140.0/23
 182.111.64.0/18
 183.216.160.0/21
 183.216.169.0/24
 183.216.170.0/23
 183.216.172.0/22
 183.216.177.0/24
 183.216.178.0/24
 183.216.180.0/22
 183.216.184.0/21
 183.216.192.0/21
 183.216.200.0/22
 183.216.204.0/23
 183.216.207.0/24
 183.216.208.0/20
 183.217.136.0/21
 183.217.144.0/21
 183.217.152.0/23
 183.217.167.0/24
 183.217.168.0/21
 183.217.176.0/22
 183.218.34.0/24
 183.218.108.0/24
 183.219.34.0/23
 183.219.36.0/22
 183.219.40.0/21
 183.219.48.0/20
 183.219.64.0/22
 202.101.198.0/23
 202.101.231.0/24
 202.109.138.0/23
 202.109.165.0/24
 210.35.208.0/21
 211.98.50.128/27
 211.141.122.0/23
 211.141.124.0/22
 218.65.76.0/22
 218.65.80.0/23
 218.65.82.0/24
 218.87.192.0/21
 218.87.232.0/21
 218.95.72.0/21
 218.204.88.0/21
 218.204.150.0/23
 220.176.160.0/27
 220.176.160.32/29
 220.176.160.40/30
 220.176.160.44/31
 220.176.160.46/32
 220.176.160.48/29
 220.176.160.56/31
 220.176.160.58/32
 220.176.160.60/30
 220.176.160.64/27
 220.176.160.96/30
 220.176.160.101/32
 220.176.160.102/31
 220.176.160.104/29
 220.176.160.112/28
 220.176.160.128/25
 220.176.161.0/24
 220.176.162.0/23
 220.176.164.0/22
 220.176.168.0/21
 220.176.176.0/20
 220.177.240.0/22
 222.49.7.0/24
 222.49.36.0/24
 222.204.104.0/22
 223.82.32.0/19
 223.82.202.0/23
 223.82.204.0/22
 223.82.208.0/21
 223.82.216.0/23
 223.83.192.0/19
 223.84.0.0/19
 223.84.32.0/23
 223.84.179.0/24
 223.84.180.0/23
 223.84.182.0/24
 223.104.174.0/24
--- a/data/cncity/361100.txt
+++ b/data/cncity/361100.txt
@@ -1,215 +0,0 @@
 39.144.168.0/24
 39.158.32.0/19
 39.158.240.0/20
 39.159.32.0/19
 39.160.128.0/19
 39.160.192.0/18
 39.161.0.0/18
 39.169.64.0/20
 39.178.0.0/19
 39.179.136.0/21
 39.179.144.0/20
 39.179.160.0/21
 58.17.0.42/32
 58.17.0.46/32
 58.17.0.54/32
 58.17.0.118/32
 58.17.35.0/24
 58.17.104.0/22
 58.17.108.0/24
 59.54.128.0/18
 59.54.192.0/22
 59.54.196.0/24
 60.200.211.0/24
 60.203.85.0/24
 60.203.86.0/23
 60.203.160.0/19
 61.131.140.0/22
 61.131.144.0/24
 61.131.243.0/24
 61.131.244.0/22
 61.131.254.0/24
 61.180.8.0/21
 61.233.214.0/23
 61.233.235.0/24
 61.233.236.0/23
 61.235.24.0/22
 61.235.28.0/24
 61.242.154.0/24
 106.4.80.0/20
 106.5.32.0/19
 106.6.0.0/19
 106.6.32.0/20
 106.6.48.0/21
 106.6.56.0/22
 106.6.62.0/23
 106.6.64.0/23
 106.6.66.0/24
 106.6.78.0/23
 106.6.80.0/20
 106.6.96.0/23
 106.6.98.0/24
 106.6.104.0/22
 106.6.110.0/23
 106.6.112.0/20
 106.6.192.0/19
 106.6.224.0/22
 106.6.230.0/24
 106.6.232.0/21
 106.6.240.0/20
 106.226.71.0/24
 106.226.72.0/21
 106.226.80.0/20
 106.226.96.0/21
 106.234.192.0/18
 111.73.0.0/18
 111.74.185.0/24
 111.74.189.0/24
 111.74.190.0/23
 111.75.64.0/20
 111.75.80.0/24
 111.75.82.0/23
 111.75.84.0/22
 111.75.88.0/21
 111.75.96.0/19
 111.77.128.0/18
 113.194.0.0/20
 113.195.117.0/24
 113.195.118.0/23
 113.195.120.0/21
 113.195.128.0/20
 115.152.132.0/22
 115.152.136.0/22
 115.152.140.0/23
 115.152.143.0/24
 115.152.144.0/20
 115.152.160.0/19
 117.40.160.0/21
 117.40.168.0/24
 117.42.0.0/19
 117.42.40.0/21
 117.42.48.0/24
 117.42.57.0/24
 117.42.58.0/23
 117.42.60.0/22
 117.42.147.0/24
 117.42.148.0/22
 117.42.152.0/21
 117.42.160.0/20
 117.42.176.0/23
 117.42.178.0/24
 117.42.179.0/24
 117.42.180.0/22
 117.42.184.0/21
 117.44.110.0/23
 117.44.112.0/23
 117.44.114.0/24
 117.127.24.0/21
 117.136.60.0/24
 117.162.120.0/21
 117.162.128.0/24
 120.203.94.0/23
 120.203.96.0/20
 120.203.245.0/24
 120.203.246.0/23
 120.203.248.0/21
 120.206.105.0/24
 121.192.128.0/24
 122.8.103.0/24
 122.8.104.0/21
 122.8.112.0/24
 122.93.61.0/24
 122.93.62.0/23
 122.93.64.0/22
 122.93.69.0/24
 122.93.70.0/23
 122.93.72.0/22
 122.93.76.0/24
 122.93.103.0/24
 123.75.192.0/18
 182.85.64.0/18
 182.86.64.0/18
 182.87.192.0/18
 182.99.64.0/19
 182.99.98.0/23
 182.99.100.0/22
 182.99.104.0/21
 182.99.112.0/20
 182.105.139.0/24
 182.108.64.0/19
 182.108.96.0/23
 182.108.98.0/24
 182.108.100.0/22
 182.108.104.0/22
 182.108.110.0/23
 182.108.112.0/20
 182.108.192.0/18
 182.109.97.0/24
 183.216.128.0/20
 183.216.144.0/22
 183.216.149.0/24
 183.216.150.0/23
 183.216.152.0/21
 183.217.96.0/20
 183.217.112.0/23
 183.218.0.0/19
 183.218.32.0/23
 183.218.35.0/24
 183.218.36.0/22
 183.218.40.0/21
 183.218.48.0/21
 183.218.56.0/24
 183.218.58.0/23
 183.218.60.0/22
 183.219.0.0/19
 183.219.32.0/23
 183.219.246.0/23
 183.219.248.0/23
 202.101.204.0/24
 202.101.236.0/24
 202.101.249.0/24
 202.109.136.0/24
 202.109.160.0/23
 202.109.162.0/24
 202.109.189.0/24
 211.98.50.64/27
 211.141.106.0/23
 211.141.108.0/23
 218.64.160.0/20
 218.65.16.0/22
 218.65.20.0/23
 218.65.22.0/24
 218.87.208.0/20
 218.87.224.0/21
 218.95.32.0/23
 218.95.34.0/24
 218.95.88.0/21
 218.193.200.0/21
 218.204.72.0/21
 218.204.146.0/23
 220.176.192.0/20
 220.176.208.0/21
 220.176.216.0/25
 220.176.216.128/28
 220.176.216.144/30
 220.176.216.148/31
 220.176.216.150/31
 220.176.216.152/29
 220.176.216.160/27
 220.176.216.192/29
 220.176.216.200/29
 220.176.216.208/28
 220.176.216.224/27
 220.176.217.0/24
 220.176.218.0/23
 220.176.220.0/22
 220.176.224.0/21
 220.177.42.0/24
 220.177.220.0/22
 222.49.3.0/24
 222.49.64.0/23
 223.82.0.0/19
 223.83.0.0/19
 223.84.96.0/19
 223.84.240.0/20
 223.104.173.0/24
--- a/data/cncity/371200.txt
+++ b/data/cncity/371200.txt
@@ -1,92 +0,0 @@
 27.204.0.0/18
 39.134.144.144/28
 39.134.145.160/27
 39.134.147.0/28
 39.134.148.96/28
 39.134.150.32/27
 39.137.76.144/28
 39.137.80.160/27
 60.215.125.0/24
 60.232.168.0/22
 61.133.60.0/23
 61.133.62.0/24
 61.133.125.0/24
 61.156.44.0/24
 61.156.51.0/24
 61.156.52.0/23
 61.156.120.0/23
 61.156.244.0/23
 61.156.246.0/24
 61.162.235.0/24
 61.162.236.0/22
 61.240.71.0/24
 61.240.72.0/24
 110.194.16.0/24
 110.194.89.0/24
 110.194.90.0/23
 110.194.92.0/22
 112.36.32.0/21
 112.38.175.0/24
 112.38.176.0/21
 112.38.184.0/23
 112.38.186.0/24
 113.121.159.0/24
 113.121.160.0/20
 113.121.176.0/24
 113.121.178.0/23
 113.121.180.0/22
 113.121.184.0/21
 114.214.124.0/22
 120.192.104.0/22
 120.192.118.0/23
 122.80.128.0/24
 122.80.134.0/23
 122.80.138.0/23
 122.80.140.0/22
 122.80.165.0/24
 122.80.191.0/24
 123.134.68.0/22
 123.134.72.0/21
 123.134.80.0/20
 123.134.96.0/19
 123.134.128.0/17
 124.132.96.0/19
 124.132.208.0/20
 140.250.128.0/18
 182.35.111.0/24
 182.35.112.0/20
 202.102.150.0/24
 202.110.220.0/24
 202.110.247.0/24
 211.97.248.0/22
 218.56.16.0/22
 218.56.160.0/31
 218.56.160.2/31
 218.56.160.4/30
 218.56.160.8/29
 218.56.160.16/29
 218.56.160.24/30
 218.56.160.28/31
 218.56.160.30/31
 218.56.160.32/27
 218.56.160.64/26
 218.56.160.128/25
 218.56.161.0/24
 218.56.162.0/23
 218.57.132.247/32
 218.57.234.0/23
 218.58.232.0/22
 218.58.248.0/21
 218.201.159.0/24
 219.231.240.0/20
 221.2.112.0/20
 222.132.153.202/32
 222.134.192.0/20
 222.134.208.0/21
 222.134.216.0/22
 222.134.220.0/23
 222.175.69.0/24
 222.175.70.0/23
 222.175.72.0/21
 222.175.80.0/20
 223.96.159.0/24
--- a/data/cncity/420700.txt
+++ b/data/cncity/420700.txt
@@ -1,76 +0,0 @@
 27.25.192.0/18
 58.19.204.0/22
 58.53.0.0/19
 58.53.32.0/20
 58.55.128.0/17
 61.136.198.128/25
 61.136.199.0/25
 61.136.199.128/27
 61.136.199.160/28
 61.136.199.176/30
 61.136.199.180/30
 61.136.199.184/29
 61.136.199.192/26
 61.136.200.0/23
 61.136.249.144/28
 61.136.249.160/27
 61.136.249.192/26
 61.136.250.0/24
 61.184.200.0/21
 61.184.208.0/23
 61.242.183.0/24
 110.121.72.0/22
 111.181.0.0/17
 113.56.59.0/24
 113.56.60.0/22
 117.151.233.0/24
 119.36.37.0/24
 119.36.38.0/23
 122.82.152.0/24
 122.188.64.0/20
 122.188.80.0/21
 122.188.88.0/24
 122.188.90.0/23
 122.188.92.0/22
 122.188.96.0/19
 125.221.0.0/23
 171.42.242.0/24
 171.115.0.0/19
 183.92.100.0/22
 202.103.12.0/26
 202.103.12.64/28
 202.103.12.80/29
 202.103.12.88/30
 202.103.12.92/30
 202.103.12.96/27
 202.103.12.128/25
 211.85.16.0/21
 211.91.153.0/24
 211.91.176.0/24
 211.146.40.0/24
 218.104.102.99/32
 218.200.92.0/23
 218.200.136.0/23
 219.138.220.0/22
 219.138.224.0/21
 220.249.125.0/24
 221.234.36.0/24
 221.234.38.128/25
 221.234.39.0/24
 221.234.40.0/23
 221.235.232.0/27
 221.235.232.32/29
 221.235.232.40/30
 221.235.232.44/31
 221.235.232.46/31
 221.235.232.48/28
 221.235.232.64/26
 221.235.232.128/25
 221.235.233.0/24
 221.235.234.0/23
 221.235.236.0/23
 222.42.216.0/22
 222.42.240.0/23
 222.42.242.0/24
 222.42.244.0/22
 223.77.240.0/21
--- a/data/cncity/430900.txt
+++ b/data/cncity/430900.txt
@@ -1,114 +0,0 @@
 36.148.109.0/24
 36.148.110.0/24
 36.157.112.0/20
 39.134.8.192/27
 39.134.11.224/27
 39.134.242.64/26
 39.134.245.44/30
 39.134.245.48/30
 39.134.247.228/30
 39.134.249.128/27
 39.134.254.2/32
 58.20.240.0/21
 58.47.128.0/17
 59.71.56.0/22
 61.137.117.0/24
 61.137.118.0/24
 61.150.200.0/21
 61.186.64.0/21
 61.187.78.0/23
 61.187.80.0/22
 61.234.235.0/24
 61.234.236.0/23
 61.236.71.79/32
 61.236.71.80/28
 61.236.71.96/27
 61.236.71.128/25
 61.237.140.0/23
 61.240.233.0/24
 61.240.234.0/24
 61.241.231.0/24
 61.241.232.0/23
 110.52.11.0/24
 110.52.12.0/22
 110.52.16.0/20
 110.206.184.0/22
 110.206.188.0/23
 110.206.216.0/21
 110.206.224.0/19
 110.207.64.0/19
 110.207.211.0/24
 110.207.212.0/22
 110.207.216.0/23
 110.207.218.0/24
 111.8.231.0/24
 111.23.160.0/23
 111.23.248.0/23
 111.23.250.0/24
 111.55.101.0/24
 113.223.94.0/24
 113.223.134.0/24
 113.223.185.0/24
 113.223.186.0/23
 113.223.188.0/22
 113.242.0.0/16
 118.252.0.0/17
 118.252.128.0/18
 118.252.192.0/19
 118.252.224.0/21
 118.252.232.0/23
 118.255.142.0/24
 119.39.192.0/21
 120.227.128.0/21
 120.227.136.0/23
 120.227.138.0/24
 120.228.225.0/24
 123.69.48.0/20
 175.4.68.0/24
 175.4.83.0/24
 175.4.102.0/24
 175.12.170.0/24
 175.12.242.0/24
 175.12.246.0/24
 202.103.86.0/24
 202.103.93.0/24
 211.69.120.0/21
 211.98.63.161/32
 211.98.63.216/30
 211.98.65.109/32
 211.98.65.112/30
 211.98.75.136/29
 211.98.75.184/29
 211.98.75.192/29
 211.98.75.210/32
 211.143.16.0/22
 211.146.246.192/26
 218.76.240.0/21
 218.77.88.0/21
 219.72.226.0/24
 219.72.237.82/32
 220.168.128.0/19
 220.170.144.0/20
 220.202.203.0/24
 220.202.204.0/24
 220.202.206.0/23
 220.248.163.0/24
 222.58.192.0/20
 222.58.208.0/21
 222.58.216.0/22
 222.241.64.0/20
 222.241.80.0/22
 222.241.84.0/23
 222.241.86.0/26
 222.241.86.64/27
 222.241.86.96/29
 222.241.86.104/30
 222.241.86.108/31
 222.241.86.110/32
 222.241.86.112/28
 222.241.86.128/25
 222.241.87.0/24
 222.241.88.0/21
 222.241.96.0/19
 223.159.181.0/24
 223.159.183.0/24
--- a/data/cncity/431100.txt
+++ b/data/cncity/431100.txt
@@ -1,137 +0,0 @@
 36.148.104.0/22
 36.157.128.0/20
 39.134.8.224/27
 39.134.12.0/27
 39.134.242.128/26
 39.134.245.52/30
 39.134.245.56/30
 39.134.247.192/27
 39.134.247.244/30
 39.134.249.240/28
 42.49.80.0/24
 42.49.84.23/32
 59.71.112.0/23
 61.137.121.0/24
 61.137.122.0/24
 61.150.231.0/24
 61.150.232.0/22
 61.150.236.0/23
 61.186.120.0/21
 61.237.75.0/24
 61.241.252.0/23
 61.241.254.0/24
 106.17.117.0/24
 110.52.169.0/24
 110.52.170.0/23
 110.52.172.0/22
 110.52.176.0/21
 110.52.184.0/22
 110.53.46.0/24
 110.206.166.0/23
 110.206.168.0/21
 110.206.176.0/22
 110.206.180.0/23
 111.8.208.0/24
 111.23.114.0/23
 113.244.0.0/17
 118.239.18.0/24
 118.239.26.0/24
 118.239.31.0/24
 119.39.164.0/22
 119.39.229.0/24
 119.39.230.0/23
 120.226.100.0/22
 120.227.144.0/21
 120.227.152.0/22
 120.227.242.0/23
 120.227.244.0/23
 120.228.212.0/22
 120.228.216.0/21
 120.228.224.0/24
 120.228.226.0/23
 120.228.228.0/23
 120.228.230.0/24
 120.228.232.0/23
 120.228.234.0/24
 123.69.176.0/20
 123.69.192.0/23
 124.229.128.0/17
 175.4.0.0/19
 175.5.0.0/16
 175.7.161.0/24
 175.15.145.0/24
 175.15.146.0/23
 175.15.148.0/22
 175.15.152.0/21
 175.15.160.0/19
 175.15.192.0/19
 175.15.224.0/21
 175.15.232.0/22
 202.103.84.0/24
 202.103.91.0/24
 202.103.122.0/24
 210.22.59.192/26
 210.22.62.0/28
 211.98.63.184/30
 211.143.25.0/24
 211.143.26.0/23
 211.143.28.0/23
 211.146.246.128/26
 218.76.248.0/22
 218.76.252.0/26
 218.76.252.64/29
 218.76.252.72/31
 218.76.252.74/31
 218.76.252.76/30
 218.76.252.80/28
 218.76.252.96/27
 218.76.252.128/25
 218.76.253.0/24
 218.76.254.0/24
 218.76.255.0/27
 218.76.255.32/28
 218.76.255.48/31
 218.76.255.50/31
 218.76.255.52/30
 218.76.255.56/29
 218.76.255.64/26
 218.76.255.128/25
 218.77.80.0/22
 218.77.84.0/25
 218.77.84.128/26
 218.77.84.192/27
 218.77.84.224/28
 218.77.84.240/30
 218.77.84.244/30
 218.77.84.248/29
 218.77.85.0/24
 218.77.86.0/23
 218.196.0.0/22
 219.72.235.0/24
 220.170.96.0/19
 220.202.134.0/24
 220.202.248.0/23
 220.202.250.0/24
 222.51.88.0/21
 222.51.96.0/23
 222.51.98.0/24
 222.243.189.0/24
 222.243.190.0/23
 222.243.192.0/25
 222.243.192.128/27
 222.243.192.160/29
 222.243.192.168/29
 222.243.192.176/30
 222.243.192.180/31
 222.243.192.182/31
 222.243.192.184/29
 222.243.192.192/26
 222.243.193.0/24
 222.243.194.0/23
 222.243.196.0/22
 222.243.200.0/21
 222.243.208.0/20
 222.243.224.0/19
 223.147.14.0/24
 223.158.111.0/24
 223.158.128.0/18
--- a/data/cncity/451100.txt
+++ b/data/cncity/451100.txt
@@ -1,127 +0,0 @@
 39.135.43.0/27
 58.59.178.0/23
 58.59.181.0/24
 58.59.182.0/23
 58.59.188.0/22
 61.240.226.0/23
 113.16.216.0/21
 113.16.224.0/23
 115.46.144.0/24
 115.46.192.0/20
 115.46.208.0/24
 115.46.213.0/24
 115.46.229.0/24
 115.46.230.0/23
 115.46.232.0/21
 115.46.240.0/20
 116.1.160.0/24
 116.1.185.0/24
 116.1.186.0/23
 116.1.188.0/24
 116.9.191.0/24
 116.9.192.0/21
 116.9.200.0/22
 116.9.204.0/27
 116.9.204.32/32
 116.9.204.34/31
 116.9.204.36/30
 116.9.204.40/29
 116.9.204.48/28
 116.9.204.64/26
 116.9.204.128/26
 116.9.204.192/29
 116.9.204.201/32
 116.9.204.202/31
 116.9.204.204/30
 116.9.204.208/28
 116.9.204.224/27
 116.9.205.0/24
 116.9.206.0/23
 116.9.208.0/20
 117.141.217.0/24
 117.181.160.0/22
 117.181.164.0/24
 117.181.166.0/24
 117.181.223.0/24
 117.183.192.0/24
 117.183.194.0/24
 121.31.96.0/22
 124.226.70.0/23
 124.226.72.0/22
 124.226.76.0/23
 124.227.180.0/24
 124.227.184.0/23
 124.227.186.0/24
 171.108.149.0/24
 171.108.150.0/23
 171.108.152.0/22
 171.108.156.0/23
 171.109.126.0/24
 180.138.122.0/24
 180.138.127.0/24
 180.142.191.0/24
 180.143.255.0/24
 202.103.223.0/25
 202.103.223.128/26
 202.103.223.192/28
 202.103.223.208/31
 202.103.223.211/32
 202.103.223.212/30
 202.103.223.216/29
 202.103.223.224/27
 218.21.66.0/25
 218.21.66.128/27
 218.21.66.160/28
 218.21.66.176/29
 218.21.66.184/31
 218.21.66.186/32
 218.21.66.188/30
 218.21.66.192/30
 218.21.66.197/32
 218.21.66.198/31
 218.21.66.200/29
 218.21.66.208/28
 218.21.66.224/28
 218.21.66.240/30
 218.21.66.244/32
 218.21.66.246/31
 218.21.66.248/29
 218.21.67.0/24
 218.21.68.0/24
 218.21.75.0/24
 218.21.76.0/25
 218.21.76.128/28
 218.21.76.144/29
 218.21.76.152/31
 218.204.23.0/24
 220.173.248.0/21
 220.200.119.0/24
 220.200.135.0/24
 221.7.152.196/31
 221.7.184.0/22
 221.7.240.0/23
 221.7.242.0/24
 222.83.232.0/21
 222.203.60.0/22
 222.216.224.0/24
 222.217.81.0/24
 222.217.82.0/23
 222.217.84.0/22
 222.217.88.0/28
 222.217.88.16/30
 222.217.88.20/31
 222.217.88.23/32
 222.217.88.24/29
 222.217.88.32/27
 222.217.88.65/32
 222.217.88.66/31
 222.217.88.68/30
 222.217.88.72/29
 222.217.88.80/28
 222.217.88.96/27
 222.217.88.128/25
 222.217.171.160/30
 222.217.171.164/31
 222.217.171.166/32
 222.218.236.0/22
 222.218.240.0/20
--- a/data/cncity/451200.txt
+++ b/data/cncity/451200.txt
@@ -1,188 +0,0 @@
 39.135.42.0/27
 39.137.141.128/26
 61.139.247.0/24
 61.139.248.0/23
 61.139.250.0/24
 61.232.150.0/24
 61.234.54.0/24
 61.235.188.0/24
 61.241.184.0/22
 61.241.188.0/24
 110.72.96.0/22
 110.72.100.0/23
 110.212.160.0/21
 110.212.168.0/22
 110.212.244.0/22
 111.58.33.0/24
 111.58.34.0/24
 113.15.93.0/24
 113.15.97.0/24
 113.15.98.0/23
 113.15.100.0/22
 113.15.104.0/21
 113.15.112.0/20
 113.15.128.0/25
 113.15.128.128/27
 113.15.128.160/29
 113.15.128.168/30
 113.15.128.173/32
 113.15.128.174/31
 113.15.128.176/28
 113.15.128.192/26
 113.15.144.0/20
 113.16.180.0/22
 113.16.184.0/21
 113.16.192.0/21
 113.16.200.0/22
 113.16.204.0/24
 113.17.30.0/23
 113.17.32.0/24
 113.17.34.0/24
 113.17.38.0/23
 113.17.43.0/24
 113.17.46.0/23
 113.17.48.0/21
 113.17.57.0/24
 113.17.58.0/23
 113.17.60.0/24
 113.17.78.0/23
 113.17.99.0/24
 113.17.100.0/22
 113.17.104.0/21
 113.17.112.0/22
 113.17.132.0/23
 113.17.168.0/24
 113.17.190.0/23
 113.17.192.0/22
 115.46.209.0/24
 115.46.210.0/23
 115.46.212.0/24
 115.46.214.0/23
 116.8.57.0/25
 116.8.57.128/26
 116.8.57.192/28
 116.8.57.208/30
 116.8.57.212/31
 116.8.57.214/32
 116.8.62.0/23
 116.8.64.0/23
 116.8.66.0/24
 116.8.68.0/23
 116.8.70.0/24
 116.8.134.0/24
 116.8.148.0/24
 116.10.0.0/19
 116.10.33.0/24
 116.10.34.0/23
 116.10.36.0/22
 116.10.40.0/21
 116.10.253.0/24
 116.253.22.0/24
 117.140.123.0/24
 117.182.39.0/24
 117.182.57.0/24
 117.182.61.0/24
 117.182.64.0/23
 117.182.68.0/24
 117.182.85.0/24
 117.183.225.0/24
 117.183.232.0/23
 123.67.152.0/22
 123.67.157.0/24
 123.67.164.0/22
 123.79.150.0/23
 123.79.152.0/21
 123.79.160.0/21
 123.79.168.0/22
 123.79.172.0/23
 123.79.174.0/24
 123.79.222.0/24
 124.226.78.0/23
 124.227.16.0/20
 124.227.32.0/22
 125.73.192.0/23
 125.73.195.0/24
 125.73.198.0/23
 125.73.200.0/21
 125.73.216.0/24
 125.217.4.0/22
 171.39.135.0/24
 171.39.136.0/21
 171.39.144.0/20
 171.39.160.0/19
 171.39.192.0/19
 171.39.224.0/22
 171.39.228.0/23
 171.107.64.0/22
 171.107.68.0/23
 171.107.70.0/24
 171.107.102.0/23
 171.107.104.0/21
 171.107.112.0/20
 171.108.141.0/24
 171.108.142.0/24
 171.109.17.0/24
 171.109.18.0/23
 171.109.20.0/22
 171.109.77.0/24
 171.109.241.0/24
 171.111.84.0/22
 171.111.226.0/23
 171.111.228.0/22
 171.111.232.0/21
 171.111.240.0/21
 175.51.136.0/21
 180.137.215.0/24
 180.137.216.0/21
 180.137.224.0/20
 180.140.83.0/24
 180.140.84.0/22
 180.140.88.0/21
 180.140.96.0/21
 180.142.32.0/20
 180.143.106.0/24
 202.103.221.0/24
 202.103.255.0/24
 202.193.24.0/21
 218.21.111.108/32
 218.65.146.0/24
 218.65.221.0/24
 218.204.1.0/24
 218.204.2.0/24
 219.159.112.166/32
 219.159.164.0/24
 219.159.165.0/25
 219.159.165.128/26
 219.159.165.192/27
 219.159.165.224/28
 219.159.165.240/29
 219.159.165.248/30
 219.159.165.252/31
 219.159.165.255/32
 219.159.166.0/23
 219.159.168.0/21
 219.159.176.0/22
 219.159.254.0/24
 220.173.203.0/24
 220.173.204.0/24
 220.173.206.0/23
 220.173.209.0/24
 220.173.210.0/23
 220.173.212.0/23
 220.200.130.0/24
 221.7.168.0/22
 221.7.224.0/23
 222.83.170.0/23
 222.83.172.0/22
 222.83.176.0/21
 222.83.184.0/22
 222.83.188.0/23
 222.83.240.0/22
 222.217.89.0/24
 222.217.90.0/23
 222.217.92.0/22
 222.217.96.0/24
 222.217.180.0/23
 222.218.112.0/20
 222.218.128.0/20
 222.218.144.0/23
--- a/data/cncity/460400.txt
+++ b/data/cncity/460400.txt
@@ -1,59 +0,0 @@
 59.49.231.0/24
 59.49.232.0/25
 59.49.232.128/28
 59.49.232.144/29
 59.49.232.152/30
 59.49.232.156/30
 59.49.232.160/27
 59.49.232.192/26
 59.49.233.0/24
 59.49.234.0/23
 59.49.236.0/22
 59.49.240.0/21
 59.50.162.0/23
 59.50.164.0/22
 59.50.168.0/22
 59.50.172.0/23
 59.50.174.0/24
 61.186.53.0/24
 61.186.54.0/23
 61.186.56.0/21
 61.243.124.200/29
 61.243.124.208/28
 61.243.124.224/27
 112.67.32.0/21
 112.67.40.0/22
 112.67.44.0/24
 113.59.12.0/23
 116.167.57.0/24
 119.41.63.0/24
 119.41.64.0/23
 119.41.81.0/24
 119.41.82.0/24
 119.41.84.0/22
 119.41.88.0/21
 119.41.96.0/19
 119.41.128.0/22
 119.41.132.0/23
 124.66.5.0/24
 124.225.48.86/32
 150.255.195.0/24
 210.37.48.0/20
 210.37.228.0/22
 210.37.232.0/21
 218.77.196.30/31
 218.77.196.32/27
 218.77.196.64/26
 218.77.196.128/26
 218.77.196.192/29
 218.77.196.200/32
 218.77.198.0/24
 221.11.191.0/25
 221.11.191.128/26
 221.11.191.192/27
 221.11.191.224/28
 221.11.191.240/29
 221.11.191.248/30
 221.11.191.252/32
 221.11.191.254/31
 223.198.98.0/24
--- a/data/cncity/510500.txt
+++ b/data/cncity/510500.txt
@@ -1,126 +0,0 @@
 39.134.200.80/28
 42.247.1.208/29
 60.255.185.0/24
 61.139.39.0/24
 61.139.40.0/23
 61.139.97.0/24
 61.139.127.0/24
 61.157.104.0/23
 61.157.161.0/24
 61.157.162.0/23
 61.157.164.0/22
 61.157.168.0/24
 61.188.101.0/24
 61.188.102.0/23
 61.188.104.0/21
 61.188.204.0/22
 110.187.96.0/23
 110.187.192.0/18
 111.9.135.0/24
 112.45.0.0/19
 112.45.32.0/23
 112.45.36.0/22
 112.45.40.0/21
 112.45.48.0/20
 112.45.195.0/24
 112.192.187.0/24
 112.194.164.0/23
 112.194.166.0/24
 112.195.128.0/20
 112.195.144.0/21
 112.195.152.0/23
 112.195.155.0/24
 112.195.156.0/22
 112.195.160.0/22
 112.195.168.0/21
 112.195.176.0/20
 116.196.33.0/24
 117.173.166.0/24
 117.177.208.0/24
 118.120.128.0/19
 118.120.160.0/20
 118.120.176.0/21
 118.120.184.0/23
 118.122.48.0/21
 118.122.56.0/22
 118.122.62.0/23
 118.125.0.0/19
 118.125.32.0/20
 118.125.48.0/21
 118.125.56.0/22
 119.5.160.0/20
 119.6.245.0/24
 119.7.138.0/23
 119.7.140.0/22
 121.48.0.0/20
 121.48.40.0/21
 121.48.48.0/20
 123.70.56.0/22
 123.70.88.0/21
 123.71.144.0/22
 123.71.226.0/23
 124.161.102.0/23
 124.161.104.0/23
 124.161.112.0/23
 124.161.114.0/24
 124.161.190.0/23
 124.161.249.0/24
 124.161.255.0/24
 125.65.128.0/19
 125.68.160.0/19
 171.89.128.0/17
 171.214.32.0/19
 175.155.16.0/21
 175.155.24.0/22
 175.155.28.0/24
 182.129.128.0/18
 182.130.192.0/18
 182.146.128.0/17
 183.220.36.0/22
 183.221.176.0/22
 183.221.192.0/21
 211.83.48.0/20
 211.83.64.0/23
 211.83.66.0/24
 211.95.177.0/28
 211.95.177.16/30
 211.95.177.20/31
 211.95.177.22/31
 211.95.177.24/29
 211.95.177.32/27
 211.95.177.64/26
 211.95.177.128/25
 218.88.212.0/22
 218.89.132.0/22
 218.89.136.0/23
 218.89.138.0/24
 218.200.181.0/24
 218.200.182.0/23
 218.203.245.0/24
 220.166.87.0/24
 220.166.88.0/21
 220.166.96.0/21
 220.166.104.0/24
 220.167.127.39/32
 220.197.63.0/25
 221.10.147.0/24
 221.10.148.0/24
 221.10.150.0/23
 221.10.152.0/22
 221.10.156.0/23
 221.10.158.0/24
 221.182.81.0/24
 221.182.82.0/24
 221.237.192.0/21
 222.19.0.0/19
 222.19.32.0/21
 222.53.113.0/24
 222.208.84.0/22
 222.208.88.0/21
 222.208.96.0/20
 222.208.112.0/23
 222.214.80.0/20
 222.214.96.0/19
 223.85.160.0/20
 223.86.144.0/20
 223.87.160.0/21
--- a/data/cncity/511100.txt
+++ b/data/cncity/511100.txt
@@ -1,350 +0,0 @@
 39.134.199.208/28
 39.137.107.32/27
 61.139.50.0/23
 61.139.52.0/25
 61.139.99.0/24
 61.139.107.98/32
 61.157.102.0/23
 61.157.153.0/24
 61.157.154.0/23
 61.157.156.0/25
 61.157.156.128/27
 61.157.156.160/28
 61.157.156.176/29
 61.157.156.184/30
 61.157.156.189/32
 61.157.156.190/31
 61.157.156.192/26
 61.157.157.0/24
 61.157.158.0/23
 61.157.160.0/24
 61.157.209.236/32
 61.188.8.0/22
 61.188.12.0/23
 61.188.14.0/24
 61.188.78.0/23
 61.188.135.0/24
 61.188.136.0/21
 61.188.144.0/21
 61.188.192.0/22
 61.236.133.0/24
 61.236.134.0/23
 61.236.154.0/25
 61.236.154.128/27
 61.236.154.160/31
 61.236.154.163/32
 61.236.154.164/30
 61.236.154.168/29
 61.236.154.176/28
 61.236.154.192/26
 61.236.155.0/27
 61.236.155.32/29
 61.236.155.40/30
 61.236.155.44/30
 61.236.155.48/28
 61.236.155.64/26
 61.236.155.128/25
 110.189.64.0/18
 110.189.224.0/19
 112.45.64.0/19
 112.192.169.0/24
 112.192.170.0/23
 112.192.172.0/22
 112.192.176.0/22
 112.192.180.0/23
 112.194.178.0/23
 112.194.180.0/22
 112.194.184.0/22
 112.194.188.0/23
 112.194.190.0/24
 112.195.253.0/24
 112.195.254.0/24
 116.196.24.0/24
 118.119.160.0/19
 118.119.192.0/18
 118.124.224.0/19
 119.5.176.0/20
 119.7.176.0/24
 119.7.178.0/24
 120.94.16.0/21
 123.70.24.0/21
 123.70.112.0/21
 123.70.176.0/21
 123.70.184.0/24
 123.70.186.0/23
 123.70.232.0/22
 123.70.240.0/21
 123.71.16.0/21
 123.71.102.0/24
 123.71.200.0/23
 124.161.14.0/24
 124.161.42.0/23
 124.161.50.0/23
 124.161.212.0/22
 125.65.0.0/19
 125.65.32.0/22
 125.65.36.0/24
 125.68.96.0/19
 125.68.128.0/19
 139.202.64.0/18
 139.204.135.0/24
 171.213.128.0/17
 171.220.55.0/24
 175.153.32.0/21
 182.134.196.0/22
 182.134.200.0/21
 182.134.208.0/20
 182.134.224.0/19
 182.135.0.0/18
 182.137.192.0/18
 182.143.157.0/24
 182.143.158.0/23
 182.143.160.0/19
 182.143.192.0/18
 182.147.0.0/17
 183.220.176.0/20
 210.12.159.0/24
 210.12.248.0/24
 210.41.80.0/22
 210.41.84.0/23
 210.41.87.0/24
 210.41.88.0/21
 210.41.160.0/20
 218.6.216.0/27
 218.6.216.32/29
 218.6.216.40/30
 218.6.216.44/30
 218.6.216.48/30
 218.6.216.52/31
 218.6.216.54/31
 218.6.216.56/29
 218.6.216.64/30
 218.6.216.68/31
 218.6.216.70/31
 218.6.216.72/30
 218.6.216.76/31
 218.6.216.78/31
 218.6.216.80/29
 218.6.216.88/31
 218.6.216.90/31
 218.6.216.92/31
 218.6.216.94/31
 218.6.216.96/27
 218.6.216.128/30
 218.6.216.132/31
 218.6.216.134/31
 218.6.216.136/29
 218.6.216.144/28
 218.6.216.160/27
 218.6.216.192/31
 218.6.216.194/31
 218.6.216.196/30
 218.6.216.200/29
 218.6.216.208/28
 218.6.216.224/29
 218.6.216.232/30
 218.6.216.236/30
 218.6.216.240/31
 218.6.216.242/31
 218.6.216.244/30
 218.6.216.248/30
 218.6.216.252/31
 218.6.216.254/31
 218.6.217.0/25
 218.6.217.128/27
 218.6.217.160/28
 218.6.217.176/30
 218.6.217.180/30
 218.6.217.184/29
 218.6.217.192/27
 218.6.217.224/30
 218.6.217.228/30
 218.6.217.232/29
 218.6.217.240/30
 218.6.217.244/30
 218.6.217.248/31
 218.6.217.250/31
 218.6.217.252/31
 218.6.217.254/31
 218.6.218.0/25
 218.6.218.128/26
 218.6.218.192/27
 218.6.218.224/28
 218.6.218.240/29
 218.6.218.248/31
 218.6.218.250/31
 218.6.218.252/30
 218.6.219.0/30
 218.6.219.4/30
 218.6.219.8/30
 218.6.219.12/30
 218.6.219.16/31
 218.6.219.18/31
 218.6.219.20/31
 218.6.219.22/31
 218.6.219.24/31
 218.6.219.26/31
 218.6.219.28/31
 218.6.219.30/31
 218.6.219.32/31
 218.6.219.34/31
 218.6.219.36/31
 218.6.219.38/31
 218.6.219.40/31
 218.6.219.42/31
 218.6.219.44/30
 218.6.219.48/31
 218.6.219.50/31
 218.6.219.52/31
 218.6.219.54/31
 218.6.219.56/30
 218.6.219.60/31
 218.6.219.62/31
 218.6.219.64/26
 218.6.219.128/25
 218.6.220.0/24
 218.6.221.0/28
 218.6.221.16/30
 218.6.221.20/31
 218.6.221.22/31
 218.6.221.24/29
 218.6.221.32/27
 218.6.221.64/29
 218.6.221.72/31
 218.6.221.74/31
 218.6.221.76/30
 218.6.221.80/28
 218.6.221.96/30
 218.6.221.100/31
 218.6.221.102/31
 218.6.221.104/29
 218.6.221.112/28
 218.6.221.128/28
 218.6.221.144/29
 218.6.221.152/31
 218.6.221.154/31
 218.6.221.156/30
 218.6.221.160/27
 218.6.221.192/27
 218.6.221.224/28
 218.6.221.240/29
 218.6.221.248/30
 218.6.221.252/31
 218.6.221.254/31
 218.6.222.0/24
 218.6.223.0/30
 218.6.223.4/31
 218.6.223.6/31
 218.6.223.8/31
 218.6.223.10/31
 218.6.223.12/31
 218.6.223.14/31
 218.6.223.16/28
 218.6.223.32/27
 218.6.223.64/26
 218.6.223.128/25
 218.88.1.60/32
 218.88.180.0/22
 218.88.184.0/23
 218.88.186.0/27
 218.88.186.32/29
 218.88.186.40/30
 218.88.186.44/30
 218.88.186.48/28
 218.88.186.64/26
 218.88.186.128/27
 218.88.186.160/28
 218.88.186.176/31
 218.88.186.178/31
 218.88.186.180/30
 218.88.186.184/29
 218.88.186.192/26
 218.88.187.0/24
 218.89.0.0/25
 218.89.0.128/28
 218.89.0.144/31
 218.89.0.147/32
 218.89.0.148/30
 218.89.0.152/29
 218.89.0.160/27
 218.89.0.192/27
 218.89.0.224/28
 218.89.0.240/30
 218.89.0.244/31
 218.89.0.247/32
 218.89.0.248/29
 218.89.1.0/24
 218.89.2.0/28
 218.89.2.16/29
 218.89.2.25/32
 218.89.2.26/31
 218.89.2.28/30
 218.89.2.32/27
 218.89.2.64/29
 218.89.2.72/30
 218.89.2.77/32
 218.89.2.78/31
 218.89.2.80/28
 218.89.2.96/27
 218.89.2.128/25
 218.89.3.0/24
 218.89.4.0/22
 218.89.8.0/21
 218.89.16.0/22
 218.89.20.0/23
 218.89.22.0/24
 218.89.23.5/32
 218.89.23.24/32
 218.89.23.34/32
 218.89.185.51/32
 218.89.185.53/32
 218.200.211.0/24
 218.200.212.0/23
 218.203.241.0/24
 220.166.137.0/24
 220.166.138.0/23
 220.166.140.0/22
 220.166.144.0/20
 220.166.160.0/23
 220.167.58.0/24
 220.167.91.0/24
 220.167.92.0/22
 220.167.96.0/24
 220.197.34.0/27
 220.197.34.32/30
 220.197.34.36/31
 220.197.34.39/32
 220.197.34.40/29
 220.197.34.48/28
 220.197.34.64/26
 220.197.34.128/25
 220.197.64.0/23
 220.197.66.0/24
 220.248.159.0/24
 221.10.111.0/24
 221.10.112.0/21
 221.10.120.0/23
 221.10.122.0/24
 221.10.240.0/24
 221.236.165.0/24
 221.236.166.0/23
 221.236.168.0/21
 221.236.176.0/20
 221.236.192.0/21
 221.236.200.0/22
 222.53.48.0/22
 222.53.52.0/22
 222.53.118.0/23
 222.53.120.0/22
 222.53.124.0/24
 222.53.192.0/22
 222.208.167.3/32
 222.213.9.34/32
 222.214.192.0/19
 223.85.28.0/22
 223.85.32.0/20
 223.85.48.0/21
 223.85.56.0/23
 223.85.59.0/24
 223.85.60.0/24
 223.86.128.0/20
--- a/data/cncity/511600.txt
+++ b/data/cncity/511600.txt
@@ -1,143 +0,0 @@
 39.134.199.144/28
 39.137.107.224/27
 60.255.30.0/24
 60.255.139.0/24
 60.255.140.0/22
 60.255.174.0/23
 61.139.59.0/24
 61.157.121.0/24
 61.157.233.0/24
 61.157.234.0/23
 61.157.236.0/23
 61.157.238.0/27
 61.157.238.32/28
 61.188.80.0/23
 61.188.82.0/24
 61.188.121.57/32
 61.188.251.0/24
 61.237.24.224/27
 61.243.20.0/23
 110.185.136.0/22
 110.185.140.0/24
 110.185.148.0/24
 110.185.157.0/24
 110.185.158.0/24
 110.188.95.0/24
 110.190.0.0/18
 111.9.84.0/22
 112.19.228.0/22
 112.19.232.0/21
 112.194.233.0/24
 112.194.234.0/23
 117.139.176.0/22
 117.139.182.0/24
 118.115.187.0/24
 118.118.0.0/18
 119.5.232.0/21
 121.48.38.0/24
 123.71.24.0/22
 123.71.56.0/22
 123.71.160.0/23
 123.71.172.0/22
 124.161.136.0/22
 125.66.0.0/18
 171.95.0.0/17
 171.220.160.0/24
 171.220.165.0/24
 175.153.191.0/24
 175.155.192.0/19
 175.155.224.0/20
 175.155.240.0/21
 175.155.248.0/22
 175.155.253.0/24
 175.155.254.0/23
 182.131.73.0/24
 182.131.74.0/23
 182.131.76.0/22
 182.131.80.0/20
 182.131.96.0/19
 182.131.128.0/18
 182.142.0.0/17
 183.222.96.0/25
 183.222.96.128/27
 183.222.96.160/28
 183.222.96.176/29
 183.222.96.184/30
 183.222.96.188/31
 183.222.96.190/32
 183.222.96.255/32
 183.222.97.0/24
 183.222.98.0/23
 183.222.100.0/22
 183.223.128.0/24
 183.223.131.0/24
 183.223.132.0/22
 183.223.136.0/21
 183.223.144.0/21
 183.223.152.0/23
 183.223.154.0/24
 183.223.156.0/22
 183.223.176.0/20
 183.223.196.0/22
 183.223.200.0/22
 183.223.240.0/21
 183.223.248.0/22
 183.223.252.0/24
 183.223.255.0/24
 211.98.217.0/24
 218.6.149.0/24
 218.6.254.0/27
 218.6.254.32/28
 218.6.254.48/29
 218.6.254.56/30
 218.6.254.61/32
 218.6.254.62/31
 218.6.254.64/26
 218.6.254.128/25
 218.6.255.0/24
 218.88.236.0/22
 218.88.240.0/23
 218.89.59.0/24
 218.89.60.0/22
 218.89.145.0/24
 218.89.146.0/24
 218.89.147.11/32
 218.89.147.12/30
 218.89.147.16/28
 218.89.147.32/27
 218.89.147.64/26
 218.89.147.128/25
 218.89.148.0/22
 218.89.152.0/23
 218.89.154.0/24
 218.200.205.0/24
 218.200.206.0/23
 220.167.117.0/24
 220.197.72.0/24
 221.10.195.39/32
 221.10.195.40/29
 221.10.195.48/28
 221.10.195.64/26
 221.10.195.128/25
 221.10.196.0/22
 221.10.200.0/24
 221.237.229.2/31
 221.237.229.4/30
 221.237.229.8/29
 221.237.229.16/28
 221.237.229.32/27
 221.237.229.64/26
 221.237.229.128/25
 221.237.230.0/23
 221.237.232.0/21
 222.53.65.0/24
 222.53.92.0/22
 222.213.7.233/32
 222.213.7.237/32
 222.213.14.146/32
 222.213.14.150/32
 222.214.64.0/20
 222.215.0.0/21
 223.85.24.0/22
 223.86.72.0/21
 223.87.112.0/20
--- a/data/cncity/511900.txt
+++ b/data/cncity/511900.txt
@@ -1,84 +0,0 @@
 39.134.199.96/28
 39.134.206.64/27
 39.137.108.64/27
 60.255.32.0/23
 61.139.57.0/24
 61.157.249.0/24
 61.157.250.0/23
 61.188.60.0/22
 61.243.18.0/23
 112.18.148.0/22
 112.19.120.0/21
 112.19.128.0/21
 112.44.36.0/22
 112.44.40.0/22
 112.192.128.0/22
 112.192.132.0/23
 112.192.134.0/24
 118.122.192.0/21
 118.122.200.0/22
 118.122.204.0/24
 118.123.122.0/23
 118.123.124.0/22
 118.123.128.0/19
 119.5.192.0/21
 119.7.192.0/23
 119.7.194.0/24
 123.71.96.0/22
 123.71.234.0/23
 124.161.46.0/24
 124.161.144.0/23
 124.161.247.0/24
 124.161.248.0/24
 125.68.192.0/20
 125.68.208.0/22
 139.202.128.0/18
 171.90.0.0/18
 171.91.86.0/24
 171.208.0.0/18
 175.153.0.0/22
 175.153.4.0/23
 175.153.6.0/24
 182.131.34.0/24
 182.131.37.0/24
 182.131.47.0/24
 182.131.58.0/24
 182.132.64.0/18
 183.223.69.0/24
 183.223.129.0/24
 183.223.130.0/24
 202.98.137.0/24
 202.98.138.0/23
 218.88.242.0/23
 218.88.244.0/24
 218.89.57.0/24
 218.89.58.0/24
 218.89.168.0/24
 218.89.172.0/23
 218.89.174.0/24
 218.200.218.0/24
 220.166.16.0/22
 220.166.20.0/23
 220.167.110.0/24
 220.197.46.0/24
 221.10.20.0/23
 221.10.33.0/24
 221.10.54.0/24
 221.10.66.0/23
 221.10.71.0/24
 221.10.223.0/24
 221.10.224.0/23
 221.10.226.0/24
 222.53.0.0/23
 222.53.2.0/24
 222.53.88.0/23
 222.208.148.0/22
 222.208.152.0/21
 222.208.160.0/22
 222.208.164.0/23
 222.213.14.218/32
 222.213.14.222/32
 222.215.8.0/21
 222.215.16.0/20
 223.85.64.0/20
 223.86.196.0/24
--- a/data/cncity/530500.txt
+++ b/data/cncity/530500.txt
@@ -1,48 +0,0 @@
 14.204.212.0/22
 14.204.220.0/22
 39.128.208.0/20
 39.129.208.0/20
 39.130.213.0/24
 39.130.237.0/24
 39.134.112.128/26
 39.137.57.0/27
 61.166.104.0/22
 61.166.108.0/23
 61.166.110.0/24
 106.56.16.0/21
 106.56.24.0/23
 112.113.128.0/18
 116.249.244.0/22
 119.62.232.0/22
 123.74.26.0/24
 123.87.112.0/20
 182.241.64.0/18
 182.247.64.0/18
 183.224.185.0/24
 183.224.186.0/23
 183.224.224.0/22
 183.224.228.0/23
 183.225.137.0/24
 183.225.138.0/23
 183.225.140.0/22
 183.225.210.0/23
 211.98.73.78/32
 211.98.73.126/32
 218.62.203.0/24
 218.62.204.0/22
 218.63.24.0/23
 218.63.73.0/24
 218.63.120.0/24
 218.63.126.0/24
 218.202.40.0/22
 218.206.46.0/23
 218.206.58.0/24
 220.163.240.0/20
 221.3.176.0/21
 221.3.220.0/23
 221.3.222.0/24
 221.213.224.0/21
 222.56.33.192/26
 222.56.127.0/24
 222.197.242.0/24
 222.219.64.0/18
--- a/data/cncity/610200.txt
+++ b/data/cncity/610200.txt
@@ -1,54 +0,0 @@
 1.84.252.0/22
 39.134.22.224/28
 39.134.24.160/27
 39.135.85.192/27
 39.137.15.48/28
 59.74.34.0/23
 61.134.53.0/24
 61.134.54.0/23
 61.185.112.0/21
 61.185.120.0/23
 61.185.122.0/24
 61.185.123.0/26
 61.185.123.64/28
 61.185.123.80/29
 61.185.123.88/31
 61.185.123.90/31
 61.185.123.92/30
 61.185.123.96/27
 61.185.123.128/25
 61.185.124.0/22
 106.36.40.0/23
 111.18.91.0/24
 111.18.127.0/24
 111.18.186.0/24
 111.18.222.0/24
 111.19.90.0/23
 113.133.64.0/19
 113.133.96.0/20
 113.133.112.0/21
 113.133.120.0/23
 113.133.123.0/24
 113.133.124.0/22
 113.141.0.0/20
 113.141.16.0/21
 113.141.24.0/22
 113.141.28.0/23
 113.141.32.0/19
 117.23.192.0/19
 117.23.224.0/24
 117.23.240.0/22
 117.23.246.0/23
 117.23.248.0/21
 117.34.240.0/21
 120.192.240.0/24
 123.139.247.0/24
 124.23.10.0/23
 124.23.12.0/22
 124.116.16.0/21
 218.200.32.0/22
 219.144.32.0/20
 221.11.124.0/24
 221.11.125.255/32
 222.91.244.0/22
 222.91.248.0/21
--- a/data/cncity/610400.txt
+++ b/data/cncity/610400.txt
@@ -1,344 +0,0 @@
 1.84.208.0/21
 1.86.124.0/23
 36.40.192.0/20
 36.41.67.0/24
 36.41.68.0/22
 36.41.72.0/21
 36.41.80.0/24
 36.42.0.0/19
 36.42.88.0/21
 36.42.112.0/20
 36.43.32.0/20
 36.43.48.0/21
 39.134.17.128/25
 39.134.22.0/27
 39.134.23.128/27
 39.135.86.0/26
 39.137.15.0/28
 59.75.60.0/22
 59.75.68.0/22
 59.75.104.0/21
 61.134.25.0/24
 61.134.26.0/23
 61.134.28.0/23
 61.185.16.0/23
 61.185.18.0/24
 61.185.19.0/30
 61.185.19.4/31
 61.185.19.6/31
 61.185.19.8/29
 61.185.19.16/28
 61.185.19.32/27
 61.185.19.64/26
 61.185.19.128/25
 61.185.20.0/24
 61.185.21.0/26
 61.185.21.64/29
 61.185.21.72/31
 61.185.21.74/32
 61.185.21.76/30
 61.185.21.80/28
 61.185.21.96/27
 61.185.21.128/27
 61.185.21.160/30
 61.185.21.164/31
 61.185.21.166/31
 61.185.21.168/29
 61.185.21.176/28
 61.185.21.192/26
 61.185.22.0/25
 61.185.22.128/29
 61.185.22.136/30
 61.185.22.140/30
 61.185.22.144/28
 61.185.22.160/27
 61.185.22.192/26
 61.185.23.0/24
 61.185.24.0/23
 61.185.26.0/27
 61.185.26.32/29
 61.185.26.40/31
 61.185.26.42/31
 61.185.26.44/30
 61.185.26.48/28
 61.185.26.64/28
 61.185.26.80/28
 61.185.26.96/27
 61.185.26.128/28
 61.185.26.144/29
 61.185.26.152/31
 61.185.26.154/31
 61.185.26.156/30
 61.185.26.160/27
 61.185.26.192/27
 61.185.26.224/28
 61.185.26.240/29
 61.185.26.248/31
 61.185.26.250/31
 61.185.26.252/30
 61.185.27.0/24
 61.185.28.0/26
 61.185.28.64/27
 61.185.28.96/28
 61.185.28.112/29
 61.185.28.120/30
 61.185.28.124/31
 61.185.28.126/31
 61.185.28.128/27
 61.185.28.160/29
 61.185.28.176/30
 61.185.28.180/32
 61.185.28.182/31
 61.185.28.184/29
 61.185.28.192/26
 61.185.29.0/25
 61.185.29.128/27
 61.185.29.160/28
 61.185.29.176/29
 61.185.29.184/29
 61.185.29.192/26
 61.185.30.0/28
 61.185.30.16/29
 61.185.30.24/31
 61.185.30.26/31
 61.185.30.28/30
 61.185.30.32/27
 61.185.30.64/26
 61.185.30.128/25
 61.185.31.0/24
 61.185.32.0/25
 61.185.32.128/27
 61.185.32.160/31
 61.185.32.162/31
 61.185.32.164/30
 61.185.32.168/29
 61.185.32.176/28
 61.185.32.192/30
 61.185.32.196/31
 61.185.32.198/31
 61.185.32.200/29
 61.185.32.208/28
 61.185.32.224/27
 61.185.33.0/24
 61.185.34.0/23
 61.185.36.0/22
 61.185.40.0/21
 61.185.211.49/32
 61.185.211.50/31
 61.185.211.52/30
 61.185.211.56/30
 61.185.211.60/32
 61.236.217.0/26
 61.236.217.64/30
 61.236.232.0/24
 61.243.96.0/24
 61.243.100.0/24
 111.18.48.0/24
 111.18.100.0/22
 111.18.149.0/24
 111.19.48.0/21
 112.46.0.0/17
 112.46.128.0/32
 112.46.128.31/32
 112.46.128.32/27
 112.46.128.64/26
 112.46.128.128/25
 112.46.129.0/24
 112.46.130.0/23
 112.46.132.0/22
 112.46.136.0/21
 112.46.144.0/20
 112.46.160.0/19
 112.46.192.0/18
 112.47.0.0/18
 112.47.64.0/19
 112.47.96.0/21
 112.47.104.0/22
 112.47.108.0/24
 112.49.0.0/24
 113.133.122.0/24
 113.137.2.0/23
 113.137.4.0/22
 113.137.8.0/21
 113.137.16.0/20
 113.137.32.0/19
 113.140.84.100/30
 113.140.84.104/31
 113.140.84.106/32
 113.142.0.0/21
 113.142.14.0/23
 113.142.16.0/22
 113.142.20.0/24
 113.142.22.0/23
 113.142.24.0/21
 113.142.32.0/20
 113.142.48.0/22
 113.142.53.0/24
 113.142.54.0/23
 113.142.56.0/21
 113.142.128.0/17
 113.200.51.160/30
 113.200.67.0/24
 113.201.151.0/24
 113.201.190.0/24
 117.23.0.0/24
 117.23.2.0/23
 117.23.4.0/22
 117.23.8.0/21
 117.23.16.0/20
 117.23.32.0/20
 117.23.48.0/23
 117.23.50.0/24
 117.23.52.0/22
 117.23.57.0/24
 117.23.58.0/23
 117.23.60.0/24
 117.23.62.0/23
 117.23.102.0/23
 117.23.104.0/21
 117.23.113.0/24
 117.23.114.0/24
 117.23.127.0/24
 117.23.128.0/18
 117.33.192.0/21
 117.33.220.0/22
 117.33.224.0/19
 117.34.224.0/20
 117.35.48.0/24
 117.35.96.0/22
 117.35.100.0/24
 117.37.0.0/18
 117.37.64.0/19
 117.37.96.0/21
 117.37.104.0/23
 120.95.64.0/21
 120.95.75.0/24
 120.95.128.0/18
 120.192.218.0/24
 120.192.222.0/23
 122.77.196.0/22
 122.77.200.0/21
 122.77.208.0/22
 122.77.212.0/23
 122.77.214.0/24
 123.139.185.0/24
 123.139.186.0/23
 123.139.188.0/23
 124.22.160.0/20
 124.22.176.0/22
 124.22.181.0/24
 124.22.182.0/23
 124.22.184.0/21
 124.23.133.0/24
 124.23.134.0/24
 124.89.2.0/28
 124.89.2.16/29
 124.89.2.24/31
 124.89.2.26/32
 124.89.2.28/30
 124.89.2.32/27
 124.89.2.64/27
 124.89.2.96/31
 124.89.12.0/22
 124.89.16.0/24
 124.89.48.0/23
 124.89.74.0/23
 124.89.77.0/24
 124.115.56.0/21
 124.115.64.0/21
 124.115.112.0/20
 124.115.210.0/23
 124.115.233.0/24
 124.116.160.0/19
 202.117.176.0/20
 202.200.64.0/20
 210.12.234.0/24
 210.12.253.0/24
 210.13.250.0/23
 210.13.252.0/23
 210.27.96.0/21
 210.27.112.0/21
 211.137.118.0/24
 211.137.131.0/24
 218.195.64.0/19
 218.200.3.0/27
 218.200.3.32/28
 218.200.3.48/31
 218.200.3.50/31
 218.200.3.52/30
 218.200.3.56/29
 218.200.3.64/26
 218.200.3.128/25
 218.200.4.0/24
 218.200.14.0/24
 219.144.64.0/19
 219.144.96.0/20
 219.145.96.0/22
 219.145.100.0/23
 219.145.102.0/24
 219.145.103.0/25
 219.145.103.128/26
 219.145.103.192/28
 219.145.103.208/29
 219.145.103.216/31
 219.145.103.219/32
 219.145.103.220/30
 219.145.103.224/27
 219.145.104.0/23
 219.145.106.0/24
 219.145.107.0/25
 219.145.107.128/26
 219.145.107.192/27
 219.145.107.224/28
 219.145.107.240/30
 219.145.107.244/31
 219.145.107.246/32
 219.145.107.248/29
 219.145.108.0/23
 219.145.110.0/24
 219.145.111.0/27
 219.145.111.32/29
 219.145.111.40/31
 219.145.111.42/32
 219.145.111.44/30
 219.145.111.48/28
 219.145.111.64/26
 219.145.111.128/25
 219.145.112.0/21
 219.145.120.0/22
 219.145.124.0/26
 219.145.124.64/28
 219.145.124.80/29
 219.145.124.88/29
 219.145.124.96/27
 219.145.124.128/25
 219.145.125.0/24
 219.145.126.0/23
 219.244.128.0/20
 219.245.192.0/19
 221.11.69.0/31
 221.11.69.2/31
 221.11.69.4/30
 221.11.69.8/30
 221.11.69.12/30
 221.11.69.16/28
 221.11.69.32/27
 221.11.69.64/26
 221.11.69.128/25
 221.11.70.0/23
 221.11.72.0/22
 221.11.76.0/26
 221.11.76.64/27
 221.11.76.96/29
 221.11.76.104/31
 221.11.76.106/31
 221.11.76.108/30
 221.11.76.112/28
 221.11.76.128/25
 221.11.77.0/24
 221.11.78.0/24
 222.41.236.0/22
 222.91.205.0/24
 222.91.206.0/23
 223.104.202.0/24
 223.104.205.0/24
--- a/data/cncity/610500.txt
+++ b/data/cncity/610500.txt
@@ -1,175 +0,0 @@
 1.81.8.0/21
 1.81.16.0/20
 1.81.32.0/19
 1.81.64.0/18
 1.86.193.0/24
 1.86.194.0/23
 1.86.196.0/22
 1.86.200.0/22
 36.41.151.0/24
 36.42.64.0/21
 36.42.96.0/20
 36.42.224.0/24
 36.42.228.0/24
 36.42.253.0/24
 36.46.107.0/24
 39.134.21.0/25
 39.134.22.64/27
 39.134.24.64/26
 39.135.86.128/26
 39.135.87.0/25
 39.135.88.0/26
 39.137.14.0/25
 39.137.15.32/28
 59.75.52.0/23
 61.134.40.0/22
 61.134.44.0/24
 61.150.1.114/32
 61.150.72.0/21
 61.150.80.0/23
 61.150.82.0/26
 61.150.82.64/27
 61.150.82.96/28
 61.150.82.112/32
 61.150.82.114/31
 61.150.82.116/30
 61.150.82.120/29
 61.150.82.128/25
 61.150.83.0/24
 61.150.84.0/24
 61.150.85.0/25
 61.150.85.128/27
 61.150.85.160/28
 61.150.85.176/30
 61.150.85.180/32
 61.150.85.182/31
 61.150.85.184/29
 61.150.85.192/26
 61.150.86.0/23
 61.150.88.0/22
 61.185.72.0/21
 61.185.80.0/21
 61.236.233.0/24
 61.236.234.0/23
 61.243.97.0/24
 106.44.128.0/23
 106.44.130.0/24
 106.44.137.0/24
 106.44.138.0/23
 106.44.140.0/22
 106.44.144.0/20
 106.44.160.0/19
 110.217.149.0/24
 110.217.150.0/23
 110.217.152.0/22
 110.217.156.0/23
 110.217.158.0/24
 110.217.192.0/20
 110.217.208.0/23
 110.217.210.0/24
 111.18.56.0/22
 111.18.60.0/23
 111.18.62.0/24
 111.18.106.0/24
 111.19.56.0/21
 111.19.104.0/22
 113.133.192.0/18
 113.134.139.0/24
 113.134.140.0/22
 113.134.144.0/22
 113.134.148.0/23
 113.134.150.0/24
 113.135.170.0/24
 113.138.64.0/18
 113.143.128.0/21
 113.143.136.0/22
 113.143.140.0/24
 113.143.142.0/23
 113.143.144.0/21
 113.143.152.0/22
 113.143.156.0/23
 113.143.158.0/24
 113.143.165.0/24
 113.143.166.0/23
 113.143.168.0/21
 113.143.176.0/20
 113.143.192.0/20
 113.143.209.0/24
 113.143.211.0/24
 113.143.212.0/22
 113.143.216.0/21
 113.143.224.0/20
 113.143.240.0/23
 113.143.243.0/24
 113.143.244.0/23
 113.143.246.0/24
 113.143.248.0/21
 113.200.175.0/24
 113.201.154.0/23
 113.201.156.0/23
 117.23.80.0/20
 117.32.64.0/19
 117.32.96.0/24
 117.34.95.0/24
 117.34.96.0/20
 117.34.141.0/24
 117.34.142.0/23
 117.34.144.0/20
 117.34.160.0/20
 117.34.176.0/24
 117.34.186.0/23
 117.34.188.0/22
 117.37.192.0/21
 117.37.200.0/24
 122.77.176.0/24
 122.77.178.0/23
 122.77.180.0/24
 122.77.183.0/24
 122.77.186.0/24
 122.77.191.0/24
 123.138.224.0/23
 123.139.148.0/23
 123.139.152.0/24
 123.139.200.0/22
 123.139.204.0/23
 123.139.236.0/24
 124.22.128.0/20
 124.22.144.0/21
 124.89.28.0/22
 124.89.32.0/21
 124.89.40.0/22
 124.89.93.0/24
 124.89.94.0/23
 124.89.108.0/22
 124.89.112.0/22
 124.115.48.0/23
 124.115.51.0/24
 124.115.52.0/22
 124.115.72.0/21
 124.115.240.0/22
 124.115.248.0/21
 124.116.80.0/24
 125.76.128.0/20
 125.76.144.0/21
 125.76.152.0/22
 203.152.65.0/24
 203.152.66.0/23
 203.152.68.0/22
 203.152.72.0/22
 203.152.76.0/23
 203.152.94.0/24
 218.195.40.0/21
 218.200.12.0/23
 218.200.15.0/24
 218.200.16.0/25
 219.145.160.0/19
 221.11.88.0/22
 221.11.92.0/23
 221.11.94.0/24
 221.11.96.0/23
 221.11.98.0/24
 222.41.59.0/24
 222.41.60.0/24
 222.41.62.0/23
 222.91.0.0/19
 222.91.132.0/22
--- a/data/cncity/610700.txt
+++ b/data/cncity/610700.txt
@@ -1,127 +0,0 @@
 1.81.128.0/17
 1.84.1.0/24
 1.84.2.0/23
 1.84.4.0/22
 1.84.8.0/21
 1.84.16.0/20
 1.84.32.0/19
 36.42.40.0/21
 36.43.64.0/19
 36.43.96.0/20
 36.43.113.0/24
 36.43.114.0/23
 36.43.116.0/22
 36.43.120.0/21
 36.45.64.0/18
 39.134.22.160/27
 39.134.23.0/26
 39.135.85.64/26
 39.135.87.176/30
 39.137.15.96/28
 59.75.54.0/23
 61.134.21.219/32
 61.134.35.0/24
 61.134.36.0/22
 61.150.92.0/28
 61.150.92.16/29
 61.150.92.24/31
 61.150.92.26/31
 61.150.92.28/30
 61.150.92.32/27
 61.150.92.64/26
 61.150.92.128/25
 61.150.93.0/24
 61.150.94.0/23
 61.150.96.0/21
 61.185.88.0/21
 61.185.96.0/20
 61.236.217.69/32
 61.236.217.70/31
 61.236.217.72/29
 61.236.217.80/28
 61.236.217.96/27
 61.236.217.128/25
 61.236.246.0/24
 61.243.98.0/24
 61.243.104.0/23
 106.44.0.0/18
 111.18.80.0/22
 111.18.178.0/24
 111.18.216.0/23
 111.19.26.0/24
 111.19.120.0/23
 112.54.64.0/24
 113.135.0.0/19
 113.137.65.0/24
 113.137.66.0/23
 113.137.68.0/22
 113.137.72.0/21
 113.137.80.0/20
 113.140.166.0/23
 113.140.168.0/23
 113.141.64.0/20
 113.141.80.0/21
 113.141.88.0/23
 113.141.90.0/24
 113.141.92.0/22
 113.141.96.0/19
 113.141.216.0/24
 113.201.0.0/19
 117.32.32.0/19
 117.33.128.0/18
 117.36.185.0/24
 117.37.240.0/24
 120.192.237.0/24
 122.77.5.0/24
 122.77.99.0/24
 122.77.100.0/22
 122.77.104.0/21
 122.77.112.0/20
 123.138.215.0/24
 124.22.96.0/24
 124.22.123.0/24
 124.22.124.0/22
 124.23.0.0/21
 124.23.8.0/23
 124.47.17.0/24
 124.89.24.0/22
 124.89.100.0/23
 124.116.102.0/23
 124.116.104.0/21
 124.116.112.0/20
 124.116.128.0/22
 124.116.132.0/23
 124.116.142.0/23
 124.116.144.0/21
 124.116.152.0/22
 124.116.156.0/23
 202.100.24.0/23
 218.195.96.0/20
 218.200.16.128/25
 218.200.17.0/24
 218.200.18.0/23
 218.200.20.0/22
 219.144.112.0/20
 219.144.128.0/23
 219.145.216.0/21
 219.145.224.0/21
 219.145.232.0/22
 219.145.236.0/23
 219.145.238.0/26
 219.145.238.64/27
 219.145.238.96/28
 219.145.238.112/29
 219.145.238.120/29
 219.145.238.128/25
 219.145.239.0/24
 221.11.99.0/24
 221.11.100.0/22
 221.11.104.0/23
 221.11.106.0/24
 222.41.61.0/24
 222.41.81.0/24
 222.41.82.0/24
 222.41.84.0/22
 222.41.228.0/24
 222.41.230.0/23
 222.41.244.0/22
--- a/data/cncity/611000.txt
+++ b/data/cncity/611000.txt
@@ -1,66 +0,0 @@
 1.82.0.0/19
 1.84.232.0/21
 36.40.208.0/21
 39.134.22.240/28
 39.134.24.128/27
 39.135.85.224/27
 39.135.87.200/30
 39.137.15.128/28
 59.75.16.0/20
 59.75.58.0/23
 61.134.49.0/24
 61.134.50.0/23
 61.134.52.0/24
 61.185.129.159/32
 61.185.129.163/32
 61.185.129.164/30
 61.185.129.168/29
 61.185.129.176/28
 61.185.129.192/27
 61.185.129.224/29
 61.185.129.232/31
 61.185.129.235/32
 61.185.129.236/30
 61.185.129.240/28
 61.185.136.0/21
 111.18.89.0/24
 111.18.125.0/24
 111.18.185.0/24
 113.136.0.0/16
 113.138.160.0/20
 113.138.176.0/22
 113.138.180.0/23
 113.138.182.0/24
 113.140.237.0/24
 113.140.238.0/23
 113.200.245.0/24
 113.200.246.0/24
 113.201.78.0/23
 113.201.80.0/20
 113.201.96.0/22
 113.201.178.0/23
 113.201.180.0/22
 113.201.184.0/23
 117.23.64.0/20
 117.33.200.0/21
 117.33.208.0/21
 117.33.216.0/22
 117.34.248.0/21
 117.35.238.0/24
 117.36.234.0/23
 120.192.219.0/24
 120.192.239.0/24
 124.22.208.0/20
 124.89.97.0/24
 124.89.98.0/24
 124.115.50.0/24
 124.115.128.0/22
 124.116.0.0/20
 210.27.52.0/22
 218.200.28.0/23
 218.200.30.0/24
 219.145.240.0/20
 221.11.95.0/24
 221.11.111.0/24
 221.11.112.0/23
 221.11.114.0/24
--- a/data/cncity/620300.txt
+++ b/data/cncity/620300.txt
@@ -1,78 +0,0 @@
 27.224.192.0/21
 27.224.216.0/22
 27.224.220.0/23
 27.224.222.0/24
 27.224.223.0/28
 27.224.223.16/29
 27.224.223.24/31
 27.227.32.0/23
 27.227.37.0/24
 27.227.38.0/23
 27.227.40.0/23
 27.227.42.0/24
 27.227.44.0/22
 27.227.48.0/20
 36.142.188.0/23
 39.134.33.192/27
 39.134.35.192/27
 39.134.37.192/27
 39.137.26.192/27
 42.88.208.0/20
 42.88.224.0/20
 42.93.152.0/24
 42.93.156.0/24
 60.164.143.0/25
 60.164.143.128/26
 60.164.143.192/32
 60.164.143.194/31
 60.164.143.196/30
 60.164.143.200/29
 60.164.143.208/28
 60.164.143.224/27
 60.164.144.0/20
 60.165.144.0/22
 60.165.149.0/24
 60.165.150.0/23
 60.165.152.0/21
 61.134.77.0/24
 61.134.81.0/24
 61.159.70.0/24
 61.178.136.0/21
 61.178.215.0/24
 61.241.175.9/32
 115.85.232.0/23
 118.180.32.0/20
 118.180.48.0/21
 118.180.57.0/24
 118.180.58.0/23
 118.180.60.0/22
 118.182.153.0/24
 118.182.208.0/21
 118.183.180.0/24
 123.81.142.0/23
 123.81.144.0/21
 123.81.152.0/22
 125.74.159.0/24
 125.74.160.0/22
 125.74.165.0/24
 125.74.166.0/23
 125.74.168.0/24
 125.74.225.0/24
 125.75.80.0/20
 125.75.192.0/23
 180.95.140.0/22
 180.95.144.0/23
 180.95.154.0/23
 180.95.156.0/23
 180.95.158.0/24
 180.95.171.0/24
 180.95.172.0/22
 180.95.176.0/24
 180.95.178.0/23
 180.95.182.0/23
 180.95.190.0/23
 210.12.161.0/24
 218.203.182.0/23
 221.7.60.0/24
 222.57.8.0/22
 222.57.12.0/24
--- a/data/cncity/620400.txt
+++ b/data/cncity/620400.txt
@@ -1,78 +0,0 @@
 27.224.128.0/20
 27.224.160.0/22
 27.224.165.0/24
 27.224.166.0/23
 27.224.168.0/21
 27.225.32.0/22
 27.225.97.0/24
 27.225.100.0/24
 27.225.111.0/24
 27.225.172.0/22
 27.226.0.0/20
 27.226.24.0/23
 27.226.29.0/24
 36.142.128.0/22
 39.134.32.192/27
 39.134.34.192/27
 39.134.36.192/27
 39.137.25.192/27
 42.92.32.0/19
 42.92.64.0/18
 42.92.193.0/24
 42.92.194.0/23
 42.92.196.0/24
 42.92.200.0/21
 42.92.208.0/20
 42.92.224.0/22
 42.92.228.0/23
 42.93.224.0/22
 42.93.228.0/24
 60.13.60.0/22
 60.164.64.0/23
 60.164.68.0/24
 60.164.70.0/23
 60.164.72.0/21
 60.165.128.0/21
 60.165.136.0/23
 60.165.138.0/24
 60.165.143.0/24
 61.134.83.0/24
 61.159.64.0/24
 61.159.67.0/24
 61.159.77.0/24
 61.178.127.0/24
 61.178.144.0/21
 61.178.172.216/32
 61.178.203.0/24
 61.178.211.0/24
 61.178.212.0/24
 61.234.13.0/24
 61.241.164.12/32
 115.85.196.0/23
 115.85.200.0/22
 115.85.206.0/23
 115.85.208.0/22
 116.176.63.0/24
 118.182.104.0/21
 118.182.112.0/22
 118.182.116.0/23
 118.182.118.0/24
 118.183.170.0/24
 121.100.160.0/24
 124.152.147.0/24
 125.74.103.0/24
 125.74.104.0/22
 125.74.128.0/22
 125.74.132.0/24
 125.75.208.0/22
 180.95.200.0/22
 180.95.204.0/23
 218.203.172.0/23
 220.200.141.0/24
 221.7.61.0/24
 221.7.62.0/24
 221.7.63.0/29
 221.7.63.8/30
 221.7.63.12/32
 222.57.13.0/24
 222.57.98.0/24
--- a/data/cncity/620600.txt
+++ b/data/cncity/620600.txt
@@ -1,115 +0,0 @@
 27.224.200.0/21
 27.224.208.0/21
 27.225.71.0/24
 27.225.176.10/31
 27.225.176.12/30
 27.225.176.16/28
 27.225.176.32/27
 27.225.176.64/26
 27.225.176.128/25
 27.225.177.0/24
 27.225.178.0/23
 27.225.180.0/22
 27.225.184.0/21
 27.225.192.0/23
 27.225.194.0/24
 27.225.196.0/22
 27.226.64.0/20
 27.226.80.0/23
 27.226.146.0/23
 27.226.148.0/22
 27.226.152.0/21
 27.226.160.0/19
 27.226.192.0/21
 27.226.200.0/22
 27.226.204.0/23
 27.227.34.0/23
 27.227.36.0/24
 27.227.43.0/24
 36.142.136.0/22
 39.134.33.96/27
 39.134.35.96/27
 39.134.37.96/27
 39.137.26.96/27
 39.144.211.0/24
 42.88.192.0/20
 42.88.240.0/20
 42.89.0.0/16
 42.90.114.0/24
 42.90.198.0/23
 42.90.200.0/22
 42.90.204.0/24
 42.93.135.0/24
 42.93.136.0/22
 42.93.140.0/24
 42.95.128.0/19
 42.95.160.0/20
 42.95.176.0/22
 42.95.180.0/23
 42.95.182.0/24
 42.95.184.0/21
 59.76.40.0/24
 60.13.44.0/23
 60.164.128.0/21
 60.164.136.0/22
 60.164.140.0/23
 60.164.142.0/24
 60.164.143.193/32
 60.164.226.20/31
 60.165.220.0/22
 60.165.224.0/22
 61.134.65.0/27
 61.134.65.32/32
 61.134.65.61/32
 61.134.65.62/31
 61.134.65.64/26
 61.134.65.128/25
 61.134.66.0/24
 61.134.74.0/24
 61.134.94.0/23
 61.178.184.0/27
 61.178.184.32/28
 61.178.184.48/29
 61.178.184.56/30
 61.178.184.61/32
 61.178.184.62/31
 61.178.184.64/31
 61.178.184.66/32
 61.178.184.68/30
 61.178.184.72/29
 61.178.184.80/28
 61.178.184.96/27
 61.178.184.128/25
 61.178.185.0/24
 61.178.186.0/23
 61.178.205.0/24
 61.232.242.192/26
 61.234.9.0/24
 61.234.10.0/24
 61.241.162.0/24
 112.54.184.0/24
 115.85.234.0/23
 118.182.216.0/21
 118.182.224.0/21
 118.183.60.0/24
 118.183.187.0/24
 118.183.188.0/22
 123.81.156.0/22
 123.81.160.0/20
 125.74.149.0/24
 125.74.150.0/23
 125.74.152.0/22
 125.74.156.0/23
 125.74.243.0/24
 125.75.144.0/21
 125.75.196.0/23
 180.95.146.0/23
 180.95.148.0/23
 180.95.184.0/22
 218.203.193.0/24
 218.203.194.0/23
 218.203.197.0/24
 218.203.202.0/24
 221.7.56.0/23
 221.7.58.0/24
 222.57.16.0/21
--- a/data/cncity/620800.txt
+++ b/data/cncity/620800.txt
@@ -1,120 +0,0 @@
 27.224.144.0/23
 27.224.148.0/22
 27.224.152.0/21
 27.224.176.0/27
 27.224.176.32/30
 27.224.176.37/32
 27.224.176.38/31
 27.224.176.40/29
 27.224.176.48/28
 27.224.176.64/26
 27.224.176.128/25
 27.224.178.0/23
 27.224.180.0/22
 27.224.184.0/21
 27.224.240.0/24
 27.225.53.0/24
 27.226.17.0/24
 27.226.18.0/23
 27.226.20.0/22
 27.226.26.0/23
 27.226.28.0/24
 27.226.30.0/24
 27.227.0.0/24
 27.227.2.0/23
 27.227.4.0/22
 27.227.8.0/23
 27.227.10.0/24
 27.227.12.0/24
 27.227.14.0/23
 27.227.16.0/23
 27.227.19.0/24
 27.227.20.0/24
 27.227.22.0/23
 27.227.24.0/22
 27.227.29.0/24
 27.227.30.0/23
 36.142.154.0/23
 36.142.156.0/23
 39.134.33.32/27
 39.134.35.32/27
 39.134.37.32/27
 39.137.26.32/27
 42.90.39.0/24
 42.90.40.0/22
 42.90.44.0/24
 42.90.46.0/23
 42.93.236.0/22
 42.93.240.0/24
 42.93.243.0/24
 42.93.244.0/23
 42.94.42.0/23
 42.94.44.0/23
 42.94.52.0/22
 60.13.34.0/24
 60.13.36.0/24
 60.13.41.0/24
 60.13.42.0/23
 60.13.48.0/23
 60.13.51.0/24
 60.164.66.0/23
 60.164.69.0/24
 60.164.186.0/23
 60.164.188.0/23
 60.164.190.0/24
 60.164.192.0/21
 60.165.192.0/21
 61.134.78.0/24
 61.159.76.0/24
 61.159.94.0/24
 61.178.180.0/23
 61.178.182.0/25
 61.178.182.128/26
 61.178.182.192/27
 61.178.182.224/28
 61.178.182.240/30
 61.178.182.244/32
 61.178.182.246/31
 61.178.182.248/29
 61.178.183.0/24
 61.178.204.0/24
 115.85.228.0/22
 115.155.160.0/22
 118.181.152.0/21
 118.182.119.0/24
 118.182.120.0/21
 118.182.132.0/22
 118.182.136.0/21
 118.182.144.0/21
 118.182.152.0/24
 118.182.154.0/23
 118.182.201.0/24
 118.182.202.0/24
 118.182.204.0/22
 118.182.248.0/21
 118.183.43.0/24
 118.183.140.0/24
 125.74.98.0/23
 125.74.100.0/24
 125.74.192.0/21
 125.74.200.0/24
 125.74.224.0/24
 125.74.226.0/24
 125.74.240.0/24
 125.75.73.0/24
 125.75.74.0/24
 125.75.79.0/24
 125.75.224.0/22
 125.75.228.0/23
 125.75.231.0/24
 125.75.232.0/22
 125.75.238.0/24
 180.95.192.0/23
 180.95.196.0/22
 218.203.187.0/24
 218.203.188.0/24
 221.7.52.0/23
 222.57.32.0/22
 222.57.36.0/23
 222.57.38.0/24
 222.57.80.0/21
--- a/data/cncity/620900.txt
+++ b/data/cncity/620900.txt
@@ -1,162 +0,0 @@
 27.224.224.0/21
 27.224.243.0/24
 27.224.244.0/22
 27.224.248.0/23
 27.225.224.0/22
 27.225.230.0/23
 27.225.232.0/23
 27.226.32.0/19
 27.226.229.0/24
 27.226.230.0/23
 27.226.232.0/21
 27.226.240.0/20
 27.227.1.0/24
 27.227.11.0/24
 27.227.13.0/24
 27.227.18.0/24
 27.227.21.0/24
 27.227.28.0/24
 27.227.90.0/24
 36.142.192.0/22
 42.88.128.0/19
 42.88.176.0/21
 42.93.154.0/24
 42.94.192.0/20
 42.94.208.0/21
 42.94.216.0/22
 42.94.220.0/23
 42.94.222.0/24
 42.94.224.0/19
 59.76.41.0/24
 60.13.32.0/23
 60.13.35.0/24
 60.164.160.0/21
 60.164.168.0/22
 60.164.172.0/23
 60.164.174.0/24
 60.164.175.0/25
 60.164.175.128/26
 60.164.175.192/27
 60.164.175.224/31
 60.164.175.226/31
 60.164.175.228/30
 60.164.175.232/29
 60.164.175.240/28
 60.165.160.0/21
 60.165.168.0/22
 60.165.172.0/23
 60.165.174.0/24
 60.165.175.0/25
 60.165.175.128/26
 60.165.175.192/27
 60.165.175.224/31
 60.165.175.226/31
 60.165.175.228/30
 60.165.175.232/29
 60.165.175.240/28
 60.165.176.0/21
 60.165.184.0/22
 60.165.188.0/23
 60.165.190.0/24
 61.134.85.0/27
 61.134.85.32/28
 61.134.85.48/30
 61.134.85.52/31
 61.134.85.55/32
 61.134.85.56/29
 61.134.85.64/26
 61.134.85.128/25
 61.134.86.0/23
 61.134.88.0/23
 61.134.91.192/26
 61.159.68.0/23
 61.159.71.0/24
 61.159.79.0/24
 61.159.91.0/24
 61.159.92.0/23
 61.178.118.0/23
 61.178.120.0/22
 61.178.124.0/24
 61.178.160.0/29
 61.178.160.8/31
 61.178.160.10/31
 61.178.160.12/30
 61.178.160.16/28
 61.178.160.32/27
 61.178.160.64/26
 61.178.160.128/25
 61.178.161.0/24
 61.178.162.0/23
 61.178.164.0/22
 61.178.178.150/32
 61.178.193.0/29
 61.178.193.8/30
 61.178.193.14/31
 61.178.193.16/30
 61.178.193.20/31
 61.178.193.22/32
 61.178.193.63/32
 61.178.193.64/30
 61.178.193.69/32
 61.178.193.70/32
 61.178.193.72/30
 61.178.193.76/32
 61.178.193.78/31
 61.178.193.80/28
 61.178.193.96/27
 61.178.193.128/28
 61.178.193.144/31
 61.178.193.147/32
 61.178.193.148/32
 61.178.193.150/31
 61.178.193.152/29
 61.178.193.161/32
 61.178.193.162/31
 61.178.193.164/30
 61.178.193.168/30
 61.178.193.173/32
 61.178.193.175/32
 61.178.193.176/30
 61.178.193.181/32
 61.178.193.182/31
 61.178.193.184/29
 61.178.193.192/29
 61.178.193.200/31
 61.178.193.204/31
 61.178.193.208/28
 61.178.193.224/27
 61.178.200.0/23
 61.241.172.0/24
 61.241.173.82/32
 115.85.204.0/24
 115.85.220.0/22
 116.176.3.0/24
 116.176.30.0/24
 118.182.160.0/21
 118.182.190.0/23
 118.182.244.0/23
 118.182.246.0/24
 118.183.220.0/24
 123.81.176.0/20
 123.81.248.0/21
 124.152.38.0/24
 124.152.58.0/24
 125.74.172.0/24
 125.74.174.0/23
 125.74.176.0/22
 125.74.180.0/23
 125.74.182.0/24
 125.74.188.0/24
 125.75.200.0/23
 125.75.204.0/22
 125.75.214.0/23
 125.75.216.0/22
 125.75.220.0/23
 125.75.222.0/24
 180.95.180.0/23
 218.203.199.0/24
 220.200.139.0/24
 221.7.42.0/23
 221.7.51.0/24
 222.57.40.0/22
 222.57.92.0/24
--- a/data/cncity/621000.txt
+++ b/data/cncity/621000.txt
@@ -1,88 +0,0 @@
 27.225.128.0/19
 36.142.158.0/23
 36.142.160.0/22
 39.134.32.224/27
 39.134.34.224/27
 39.134.36.224/27
 39.137.25.224/27
 42.88.0.0/20
 42.88.32.0/20
 42.90.95.0/24
 42.90.100.0/23
 42.90.126.0/24
 42.93.32.0/20
 42.93.48.0/21
 42.93.56.0/22
 42.93.60.0/23
 42.93.62.0/24
 42.93.160.0/24
 42.94.176.0/21
 42.94.184.0/22
 42.94.188.0/23
 42.94.190.0/24
 42.95.72.0/24
 59.76.0.0/19
 59.76.48.0/20
 60.13.40.0/24
 60.164.96.0/20
 60.165.96.0/24
 60.165.98.0/23
 60.165.100.0/22
 60.165.104.0/22
 60.165.148.0/24
 60.165.229.0/24
 60.165.230.0/23
 60.165.232.0/21
 60.165.240.0/21
 61.134.70.0/23
 61.134.75.0/24
 61.159.78.0/24
 61.178.172.0/25
 61.178.172.128/26
 61.178.172.192/28
 61.178.172.208/29
 61.178.172.217/32
 61.178.172.218/31
 61.178.172.220/30
 61.178.172.224/27
 61.178.173.0/24
 61.178.174.0/23
 61.178.202.0/24
 61.178.206.0/23
 61.178.214.0/24
 61.241.163.0/24
 61.241.173.0/26
 61.241.173.64/29
 61.241.173.72/32
 61.241.173.75/32
 61.241.173.76/30
 61.241.173.80/31
 61.241.173.83/32
 61.241.173.84/30
 61.241.173.88/29
 61.241.173.96/27
 61.241.173.128/25
 115.85.212.0/22
 118.182.16.0/20
 118.182.88.0/21
 118.183.126.0/24
 118.183.161.0/24
 118.183.238.0/24
 124.152.178.0/23
 124.152.180.0/22
 124.152.184.0/21
 125.74.121.0/24
 125.74.122.0/23
 125.74.124.0/22
 125.74.164.0/24
 125.74.242.0/24
 125.75.64.0/21
 125.75.136.0/21
 125.75.194.0/23
 180.95.136.0/22
 180.95.216.0/22
 218.203.169.0/24
 218.203.171.0/24
 221.7.54.0/24
 222.57.56.0/24
 222.57.112.0/23
--- a/data/cncity/621200.txt
+++ b/data/cncity/621200.txt
@@ -1,51 +0,0 @@
 27.224.64.0/20
 27.225.0.0/19
 27.225.65.0/24
 27.225.66.0/23
 27.225.68.0/24
 27.225.77.0/24
 27.225.78.0/24
 36.142.166.0/23
 36.142.168.0/22
 39.134.33.0/27
 39.134.35.0/27
 39.134.37.0/27
 39.137.26.0/27
 42.93.63.0/24
 42.93.184.0/21
 43.243.5.0/24
 60.164.200.0/21
 60.164.227.0/24
 60.164.230.0/23
 60.164.232.0/21
 60.164.240.0/21
 60.164.248.0/23
 60.164.250.0/24
 60.164.252.0/22
 60.165.200.0/21
 61.134.65.33/32
 61.134.65.34/31
 61.134.65.36/30
 61.134.65.40/29
 61.134.65.48/29
 61.134.65.56/30
 61.134.65.60/32
 61.159.74.0/24
 61.178.188.0/22
 118.182.49.0/24
 118.182.50.0/23
 118.182.52.0/22
 118.182.56.0/21
 118.182.64.0/23
 118.182.128.0/22
 118.182.192.0/21
 124.152.31.0/24
 125.74.201.0/24
 125.74.202.0/23
 125.74.204.0/23
 125.74.206.0/24
 125.75.236.0/24
 180.95.150.0/23
 180.95.152.0/23
 180.95.160.0/22
 222.23.16.0/20
--- a/data/cncity/640300.txt
+++ b/data/cncity/640300.txt
@@ -1,240 +0,0 @@
 1.50.128.0/21
 1.50.156.0/22
 1.50.232.0/22
 14.134.116.0/22
 14.134.120.0/21
 14.134.128.0/22
 14.134.132.0/23
 14.134.134.0/24
 14.134.255.0/24
 14.135.128.0/21
 14.135.136.0/23
 36.103.0.0/22
 36.103.28.0/22
 36.103.32.0/21
 36.103.56.0/22
 36.103.96.0/22
 36.103.108.0/22
 36.178.250.0/24
 39.134.93.96/28
 39.134.94.64/26
 39.137.42.64/28
 39.137.42.224/27
 42.63.192.0/18
 61.133.195.50/32
 61.133.195.103/32
 61.133.195.104/31
 61.133.197.0/24
 61.133.200.0/24
 61.133.201.0/26
 61.133.201.64/29
 61.133.201.72/30
 61.133.201.76/31
 61.133.201.79/32
 61.133.201.80/28
 61.133.201.96/29
 61.133.201.104/30
 61.133.201.108/31
 61.133.201.111/32
 61.133.201.112/28
 61.133.201.128/27
 61.133.201.160/29
 61.133.201.168/30
 61.133.201.172/31
 61.133.201.175/32
 61.133.201.176/30
 61.133.201.180/31
 61.133.201.183/32
 61.133.201.184/29
 61.133.201.192/31
 61.133.201.195/32
 61.133.201.196/31
 61.133.201.199/32
 61.133.201.200/31
 61.133.201.203/32
 61.133.201.204/31
 61.133.201.207/32
 61.133.201.208/30
 61.133.201.212/31
 61.133.201.215/32
 61.133.201.216/31
 61.133.201.219/32
 61.133.201.220/31
 61.133.201.223/32
 61.133.201.224/27
 61.133.219.194/32
 61.243.114.0/23
 103.222.187.0/24
 111.49.60.0/23
 111.49.158.0/24
 111.49.166.0/24
 111.112.161.0/24
 111.112.162.0/23
 111.112.164.0/22
 111.112.168.0/21
 111.112.176.0/21
 111.112.184.0/23
 111.112.186.0/24
 119.60.27.0/24
 119.60.160.0/20
 119.60.176.0/21
 119.60.184.0/22
 119.60.188.0/23
 119.60.190.0/24
 124.224.128.0/20
 124.224.144.0/22
 124.224.148.0/23
 124.224.151.0/24
 124.224.152.0/21
 124.224.163.0/24
 124.224.164.0/23
 202.100.116.72/30
 202.100.116.76/31
 202.100.116.78/32
 211.93.4.0/24
 218.21.16.0/20
 218.21.32.0/24
 218.21.33.0/26
 218.21.33.64/30
 218.21.33.68/31
 218.21.33.71/32
 218.21.33.72/30
 218.21.33.76/31
 218.21.33.79/32
 218.21.33.80/28
 218.21.33.96/27
 218.21.33.128/31
 218.21.33.131/32
 218.21.33.132/31
 218.21.33.135/32
 218.21.33.136/29
 218.21.33.144/28
 218.21.33.160/30
 218.21.33.164/31
 218.21.33.167/32
 218.21.33.168/29
 218.21.33.176/31
 218.21.33.179/32
 218.21.33.180/30
 218.21.33.184/31
 218.21.33.187/32
 218.21.33.188/30
 218.21.33.192/26
 218.21.34.0/30
 218.21.34.4/31
 218.21.34.7/32
 218.21.34.8/31
 218.21.34.11/32
 218.21.34.12/31
 218.21.34.15/32
 218.21.34.16/31
 218.21.34.19/32
 218.21.34.20/30
 218.21.34.24/31
 218.21.34.27/32
 218.21.34.28/31
 218.21.34.31/32
 218.21.34.32/29
 218.21.34.40/31
 218.21.34.43/32
 218.21.34.44/30
 218.21.34.48/31
 218.21.34.51/32
 218.21.34.52/30
 218.21.34.56/30
 218.21.34.60/31
 218.21.34.63/32
 218.21.34.64/29
 218.21.34.72/31
 218.21.34.75/32
 218.21.34.76/31
 218.21.34.79/32
 218.21.34.80/28
 218.21.34.96/27
 218.21.34.128/25
 218.21.35.0/28
 218.21.35.16/31
 218.21.35.19/32
 218.21.35.20/30
 218.21.35.24/31
 218.21.35.27/32
 218.21.35.28/30
 218.21.35.32/31
 218.21.35.35/32
 218.21.35.36/30
 218.21.35.40/31
 218.21.35.43/32
 218.21.35.44/30
 218.21.35.48/28
 218.21.35.64/27
 218.21.35.96/28
 218.21.35.112/30
 218.21.35.116/31
 218.21.35.119/32
 218.21.35.120/29
 218.21.35.128/28
 218.21.35.144/29
 218.21.35.152/30
 218.21.35.156/31
 218.21.35.159/32
 218.21.35.160/30
 218.21.35.164/31
 218.21.35.167/32
 218.21.35.168/31
 218.21.35.171/32
 218.21.35.172/31
 218.21.35.175/32
 218.21.35.176/31
 218.21.35.179/32
 218.21.35.180/31
 218.21.35.183/32
 218.21.35.184/31
 218.21.35.187/32
 218.21.35.188/30
 218.21.35.192/26
 218.21.36.0/24
 218.21.37.0/30
 218.21.37.4/31
 218.21.37.7/32
 218.21.37.8/29
 218.21.37.16/28
 218.21.37.32/27
 218.21.37.64/26
 218.21.37.128/25
 218.21.38.0/27
 218.21.38.32/28
 218.21.38.48/30
 218.21.38.53/32
 218.21.38.54/31
 218.21.38.56/29
 218.21.38.64/26
 218.21.38.128/25
 218.21.39.74/32
 218.95.176.0/23
 218.95.179.0/24
 218.95.184.0/21
 220.200.240.0/24
 221.11.247.0/24
 221.199.15.54/32
 221.199.15.134/32
 221.199.15.170/32
 221.199.15.174/32
 221.199.48.0/24
 222.58.117.0/24
 222.58.118.0/23
 222.75.64.0/24
 222.75.67.0/24
 222.75.68.0/23
 222.75.70.0/24
 222.75.177.38/32
 222.75.177.54/32
 222.75.177.66/32
 222.75.177.70/32
 222.75.177.74/32
 222.75.177.78/32
 222.75.177.102/32
 222.75.177.106/32
 222.75.177.202/32
 222.75.177.210/32
 222.75.177.250/32
 222.75.233.56/32
--- a/data/cncity/653100.txt
+++ b/data/cncity/653100.txt
@@ -1,145 +0,0 @@
 36.96.20.0/22
 36.96.24.0/21
 36.108.47.0/24
 36.182.107.0/24
 36.182.108.0/22
 36.182.112.0/20
 36.182.128.0/20
 36.184.120.0/23
 39.134.239.192/27
 49.114.96.0/19
 49.114.128.0/18
 49.115.224.0/19
 49.116.64.0/21
 49.116.76.0/22
 49.116.84.0/22
 49.116.88.0/22
 49.116.94.0/23
 60.13.194.0/24
 60.13.215.0/24
 61.128.115.0/24
 61.233.197.0/24
 61.243.75.0/24
 61.243.76.0/24
 61.243.77.0/26
 61.243.77.64/30
 61.243.77.68/31
 61.243.77.70/32
 61.243.77.77/32
 61.243.77.78/31
 61.243.77.80/28
 61.243.77.96/27
 61.243.77.128/25
 61.243.78.0/23
 61.243.80.0/24
 103.3.139.0/24
 106.124.28.0/22
 106.124.32.0/22
 106.124.219.0/24
 110.154.98.0/23
 110.154.100.0/22
 110.154.104.0/21
 110.154.112.0/20
 110.154.128.0/21
 110.154.136.0/22
 110.154.140.0/23
 110.154.142.0/24
 116.178.235.0/24
 120.68.162.0/23
 120.68.164.0/22
 120.68.168.0/21
 120.68.176.0/21
 120.68.184.0/22
 120.68.188.0/23
 120.68.190.0/24
 120.205.28.59/32
 120.205.28.60/32
 120.205.33.80/30
 120.205.116.0/23
 120.205.144.0/21
 120.205.152.0/22
 120.205.188.0/23
 120.205.224.0/22
 120.205.230.0/23
 121.46.82.0/24
 124.88.208.0/22
 124.88.212.0/23
 124.88.223.0/24
 124.118.120.0/21
 124.118.128.0/19
 124.118.160.0/23
 124.118.162.0/24
 175.50.224.0/19
 218.31.138.0/23
 218.31.140.0/22
 218.31.144.0/22
 218.31.241.0/24
 218.31.247.0/24
 218.84.168.0/21
 218.84.176.0/22
 218.84.180.0/24
 218.84.252.0/24
 218.195.192.0/20
 220.192.208.0/21
 221.7.22.0/24
 222.60.68.0/24
 222.60.93.86/32
 222.60.112.0/23
 222.60.116.0/22
 222.80.64.0/21
 222.80.72.0/24
 222.80.73.64/26
 222.80.73.128/25
 222.80.74.0/23
 222.80.76.0/22
 222.80.80.0/24
 222.80.81.0/25
 222.80.82.0/23
 222.80.84.0/22
 222.80.88.0/22
 222.80.92.0/23
 222.80.94.0/25
 222.80.94.128/27
 222.80.94.160/28
 222.80.94.176/29
 222.80.94.192/26
 222.80.95.0/24
 222.80.96.0/20
 222.83.13.114/32
 222.83.13.118/32
 222.83.13.182/32
 222.83.16.20/32
 222.83.19.235/32
 222.83.21.128/27
 222.83.21.160/28
 222.83.21.184/29
 222.83.21.192/29
 222.83.21.204/30
 222.83.21.216/29
 222.83.21.224/29
 222.83.21.248/30
 222.83.24.232/32
 222.83.24.235/32
 222.83.24.240/30
 222.83.24.244/32
 222.83.25.100/30
 222.83.25.144/30
 222.83.28.128/25
 222.83.30.152/29
 222.83.30.160/29
 222.83.30.168/30
 222.83.36.128/30
 222.83.39.0/29
 222.83.39.8/30
 222.83.39.28/30
 222.83.41.0/29
 223.115.0.0/20
 223.115.16.0/21
 223.115.56.0/21
 223.115.64.0/20
 223.115.104.0/21
 223.115.120.0/21
 223.117.0.0/21
 223.117.24.0/21
 223.117.32.0/21
 223.117.56.0/21
--- a/data/cncity/710000.txt
+++ b/data/cncity/710000.txt
--- a/data/cncity/810000.txt
+++ b/data/cncity/810000.txt
@@ -1070,6 +1070,7 @@
 43.251.228.0/22
 43.251.236.0/22
 43.251.248.0/22
 43.252.52.0/22
 43.252.148.0/24
 43.252.160.0/20
 43.252.176.0/22
@@ -1511,10 +1512,34 @@
 57.96.32.0/19
 57.96.64.0/20
 58.64.128.0/17
-58.82.228.0/24
+58.82.192.0/23
-58.82.232.0/23
+58.82.194.0/23
-58.82.234.0/24
+58.82.196.0/23
-58.82.248.0/24
+58.82.198.0/23
 58.82.200.0/23
 58.82.202.0/23
 58.82.204.0/23
 58.82.206.0/23
 58.82.208.0/23
 58.82.210.0/23
 58.82.212.0/23
 58.82.214.0/23
 58.82.216.0/22
 58.82.220.0/23
 58.82.222.0/23
 58.82.224.0/22
 58.82.228.0/22
 58.82.232.0/22
 58.82.236.0/23
 58.82.238.0/23
 58.82.240.0/23
 58.82.242.0/23
 58.82.244.0/23
 58.82.246.0/23
 58.82.248.0/23
 58.82.250.0/23
 58.82.252.0/23
 58.82.254.0/23
 58.84.5.0/24
 58.84.6.0/23
 58.84.52.0/22
@@ -2405,7 +2430,8 @@
 103.15.26.0/23
 103.15.28.0/22
 103.15.38.0/24
-103.15.84.0/22
+103.15.84.0/23
 103.15.86.0/23
 103.15.104.0/22
 103.15.120.0/22
 103.15.132.0/22
@@ -4193,7 +4219,13 @@
 123.108.254.193/32
 123.108.254.210/32
 123.108.254.221/32
-123.136.0.0/20
+123.136.0.0/23
 123.136.2.0/23
 123.136.4.0/22
 123.136.8.0/23
 123.136.10.0/23
 123.136.12.0/23
 123.136.14.0/23
 123.136.80.0/20
 123.176.96.0/21
 123.202.0.0/15
@@ -4804,7 +4836,118 @@
 160.238.34.0/23
 160.238.58.0/23
 160.238.84.0/22
-161.81.0.0/16
+161.81.0.0/23
 161.81.2.0/23
 161.81.4.0/23
 161.81.6.0/23
 161.81.8.0/22
 161.81.12.0/23
 161.81.14.0/23
 161.81.16.0/23
 161.81.18.0/23
 161.81.20.0/23
 161.81.22.0/23
 161.81.24.0/21
 161.81.32.0/23
 161.81.34.0/23
 161.81.36.0/23
 161.81.38.0/23
 161.81.40.0/22
 161.81.44.0/23
 161.81.46.0/23
 161.81.48.0/23
 161.81.50.0/23
 161.81.52.0/22
 161.81.56.0/23
 161.81.58.0/23
 161.81.60.0/23
 161.81.62.0/23
 161.81.64.0/23
 161.81.66.0/23
 161.81.68.0/22
 161.81.72.0/23
 161.81.74.0/23
 161.81.76.0/23
 161.81.78.0/23
 161.81.80.0/22
 161.81.84.0/23
 161.81.86.0/23
 161.81.88.0/23
 161.81.90.0/23
 161.81.92.0/23
 161.81.94.0/23
 161.81.96.0/23
 161.81.98.0/23
 161.81.100.0/23
 161.81.102.0/23
 161.81.104.0/23
 161.81.106.0/23
 161.81.108.0/23
 161.81.110.0/23
 161.81.112.0/23
 161.81.114.0/23
 161.81.116.0/23
 161.81.118.0/23
 161.81.120.0/23
 161.81.122.0/23
 161.81.124.0/22
 161.81.128.0/23
 161.81.130.0/23
 161.81.132.0/23
 161.81.134.0/23
 161.81.136.0/23
 161.81.138.0/23
 161.81.140.0/22
 161.81.144.0/23
 161.81.146.0/23
 161.81.148.0/23
 161.81.150.0/23
 161.81.152.0/22
 161.81.156.0/23
 161.81.158.0/23
 161.81.160.0/23
 161.81.162.0/23
 161.81.164.0/23
 161.81.166.0/23
 161.81.168.0/23
 161.81.170.0/23
 161.81.172.0/23
 161.81.174.0/23
 161.81.176.0/22
 161.81.180.0/23
 161.81.182.0/23
 161.81.184.0/23
 161.81.186.0/23
 161.81.188.0/23
 161.81.190.0/23
 161.81.192.0/23
 161.81.194.0/23
 161.81.196.0/23
 161.81.198.0/23
 161.81.200.0/23
 161.81.202.0/23
 161.81.204.0/23
 161.81.206.0/23
 161.81.208.0/23
 161.81.210.0/23
 161.81.212.0/23
 161.81.214.0/23
 161.81.216.0/22
 161.81.220.0/22
 161.81.224.0/23
 161.81.226.0/23
 161.81.228.0/23
 161.81.230.0/23
 161.81.232.0/23
 161.81.234.0/23
 161.81.236.0/23
 161.81.238.0/23
 161.81.240.0/23
 161.81.242.0/23
 161.81.244.0/22
 161.81.248.0/23
 161.81.250.0/23
 161.81.252.0/22
 161.123.160.0/19
 161.123.192.0/19
 161.202.32.0/19
@@ -5522,7 +5665,18 @@
 182.236.240.0/20
 182.237.0.0/22
 182.239.48.0/20
-182.239.64.0/18
+182.239.64.0/23
 182.239.66.0/23
 182.239.68.0/23
 182.239.70.0/23
 182.239.72.0/21
 182.239.80.0/20
 182.239.96.0/23
 182.239.98.0/23
 182.239.100.0/23
 182.239.102.0/23
 182.239.104.0/21
 182.239.112.0/20
 182.255.24.0/22
 182.255.32.0/24
 182.255.35.0/24
@@ -6497,7 +6651,14 @@
 203.132.192.0/20
 203.135.128.0/19
 203.142.88.0/21
-203.142.96.0/19
+203.142.96.0/21
 203.142.104.0/22
 203.142.108.0/23
 203.142.110.0/23
 203.142.112.0/21
 203.142.120.0/22
 203.142.124.0/23
 203.142.126.0/23
 203.145.64.0/19
 203.147.110.0/23
 203.153.4.0/23
@@ -7180,6 +7341,69 @@
 223.120.2.81/32
 223.120.2.85/32
 223.120.2.118/32
 223.122.16.0/23
 223.122.24.0/23
 223.122.32.0/23
 223.122.34.0/23
 223.122.36.0/23
 223.122.38.0/23
 223.122.40.0/22
 223.122.44.0/23
 223.122.46.0/23
 223.122.48.0/23
 223.122.50.0/23
 223.122.52.0/23
 223.122.54.0/23
 223.122.56.0/23
 223.122.58.0/23
 223.122.60.0/23
 223.122.62.0/23
 223.122.64.0/23
 223.122.66.0/23
 223.122.68.0/23
 223.122.70.0/23
 223.122.72.0/23
 223.122.74.0/23
 223.122.76.0/23
 223.122.78.0/23
 223.122.80.0/23
 223.122.82.0/23
 223.122.84.0/23
 223.122.86.0/23
 223.122.88.0/23
 223.122.90.0/23
 223.122.92.0/23
 223.122.94.0/23
 223.122.96.0/23
 223.122.98.0/23
 223.122.100.0/22
 223.122.104.0/23
 223.122.106.0/23
 223.122.108.0/23
 223.122.110.0/23
 223.122.112.0/22
 223.122.116.0/23
 223.122.118.0/23
 223.122.120.0/23
 223.122.122.0/23
 223.122.124.0/23
 223.122.126.0/23
 223.122.128.0/22
 223.122.132.0/22
 223.122.136.0/22
 223.122.140.0/23
 223.122.142.0/23
 223.122.144.0/20
 223.122.160.0/19
 223.122.192.0/23
 223.122.194.0/23
 223.122.196.0/23
 223.122.198.0/23
 223.122.200.0/23
 223.122.202.0/23
 223.122.204.0/22
 223.122.208.0/20
 223.122.224.0/19
 223.130.32.0/19
 223.197.0.0/16
 223.223.216.0/22
--- a/data/country/CA/CA-AB.txt
+++ b/data/country/CA/CA-AB.txt
@@ -1,15 +0,0 @@
 68.179.0.0/19
 68.179.32.0/20
 99.185.0.0/16
 99.186.0.0/15
 99.188.0.0/14
 136.159.0.0/16
 142.13.0.0/16
 142.66.0.0/16
 161.184.117.0/24
 164.102.0.0/16
 164.166.0.0/16
 198.161.127.0/24
 198.161.243.0/24
 199.167.24.0/22
 216.55.192.0/24
--- a/data/country/CA/CA-BC.txt
+++ b/data/country/CA/CA-BC.txt
@@ -1,46 +0,0 @@
 8.44.60.0/24
 46.254.88.0/22
 47.246.92.0/23
 64.71.128.0/21
 64.71.136.0/23
 64.71.138.128/25
 64.71.139.0/24
 64.71.140.0/22
 64.71.144.0/20
 64.71.160.0/19
 65.49.224.0/20
 66.38.128.0/24
 66.119.160.0/19
 67.215.85.0/24
 69.10.128.0/19
 75.153.108.0/24
 99.165.0.0/16
 99.166.0.0/15
 99.168.0.0/13
 99.176.0.0/16
 104.129.180.0/22
 128.189.0.0/20
 128.189.32.0/19
 134.87.32.0/19
 134.87.128.0/18
 142.30.0.0/16
 142.104.0.0/16
 142.165.3.0/24
 151.101.212.0/22
 162.247.14.0/24
 172.93.32.0/21
 192.111.132.0/24
 199.167.16.0/22
 199.167.20.0/23
 199.182.204.0/24
 206.12.48.0/24
 206.12.50.0/24
 206.12.59.0/24
 206.12.88.0/21
 206.12.96.0/21
 206.12.154.0/23
 206.87.80.0/20
 206.87.160.0/19
 207.23.32.0/22
 207.23.36.0/24
 216.251.128.0/19
--- a/data/country/CA/CA-MB.txt
+++ b/data/country/CA/CA-MB.txt
@@ -1,16 +0,0 @@
 72.13.160.0/19
 99.177.0.0/16
 99.178.0.0/15
 99.180.0.0/16
 99.181.0.0/18
 99.181.64.0/20
 99.181.88.0/21
 99.181.96.0/19
 99.181.128.0/17
 99.182.0.0/15
 99.184.0.0/16
 142.132.0.0/16
 142.161.27.0/24
 198.163.6.0/24
 198.163.152.0/24
 207.161.0.0/16
--- a/data/country/CA/CA-NB.txt
+++ b/data/country/CA/CA-NB.txt
@@ -1,3 +0,0 @@
 64.5.253.0/24
 72.139.9.0/24
 72.139.19.0/24
--- a/data/country/CA/CA-NO.txt
+++ b/data/country/CA/CA-NO.txt
@@ -1,371 +0,0 @@
 8.44.6.0/24
 8.44.61.0/24
 8.44.63.0/24
 24.36.23.0/24
 24.36.166.0/24
 24.102.0.0/18
 24.153.22.0/24
 24.156.128.0/19
 31.13.80.0/24
 38.111.114.0/24
 38.121.80.0/21
 40.90.138.32/27
 45.62.192.0/18
 47.246.83.0/24
 50.115.180.0/24
 52.84.143.0/24
 52.228.0.0/17
 52.233.0.0/18
 52.237.0.0/18
 52.239.148.64/26
 52.239.189.0/24
 52.245.28.0/22
 52.253.200.0/22
 63.92.228.0/24
 64.26.186.0/24
 64.96.64.0/18
 64.96.128.0/18
 64.97.0.0/20
 64.97.16.0/23
 64.97.19.0/24
 64.97.20.0/22
 64.97.24.0/21
 64.97.32.0/19
 64.97.64.0/18
 64.97.128.0/17
 64.98.0.0/15
 64.137.128.0/17
 64.229.82.0/24
 65.19.14.0/24
 65.39.64.0/18
 65.39.128.0/18
 65.39.192.0/21
 65.39.200.0/22
 65.39.204.0/24
 65.39.206.0/23
 65.39.208.0/20
 65.39.224.0/19
 65.93.176.0/24
 65.95.64.0/21
 66.38.192.0/24
 66.135.96.0/19
 66.185.80.0/22
 66.185.84.0/22
 66.185.88.0/21
 66.241.130.66/32
 67.70.36.0/22
 67.70.64.0/22
 67.71.92.0/22
 67.193.0.0/16
 67.208.0.0/19
 67.215.84.0/24
 68.183.192.0/20
 69.90.214.0/24
 69.156.151.0/24
 69.158.117.0/24
 69.158.118.0/23
 69.158.120.0/21
 69.158.128.0/21
 69.158.136.0/23
 69.159.75.0/24
 69.166.112.0/20
 70.27.0.0/21
 70.27.8.0/21
 70.27.16.0/20
 70.27.32.0/20
 70.27.48.0/21
 70.27.64.0/20
 70.27.80.0/20
 70.27.96.0/21
 70.27.104.0/21
 70.27.112.0/21
 70.27.120.0/21
 70.27.128.0/21
 70.27.136.0/21
 70.27.144.0/22
 70.27.152.0/21
 70.27.160.0/21
 70.27.168.0/21
 70.27.176.0/21
 70.27.184.0/21
 70.27.196.0/22
 70.27.200.0/21
 70.27.232.0/22
 70.48.149.0/24
 70.48.150.0/24
 70.50.175.0/24
 70.51.94.0/24
 70.53.0.0/16
 70.54.44.0/22
 70.54.52.0/22
 71.17.0.0/18
 71.17.64.0/19
 71.17.96.0/22
 71.17.100.0/23
 71.17.102.0/23
 71.17.104.0/21
 71.17.112.0/20
 71.17.128.0/17
 72.38.0.0/15
 72.136.61.0/24
 72.136.62.0/23
 72.136.64.0/20
 72.136.80.0/23
 72.136.98.0/23
 72.136.100.0/22
 72.136.104.0/21
 72.136.112.0/21
 72.136.120.0/24
 72.137.193.0/24
 72.138.0.0/16
 72.139.1.0/24
 72.139.2.0/23
 72.139.4.0/23
 72.139.7.0/24
 72.139.8.0/24
 72.139.11.0/24
 72.139.12.0/23
 72.139.14.0/24
 72.139.17.0/24
 72.139.18.0/24
 72.139.20.0/23
 72.139.22.0/24
 72.139.24.0/23
 72.139.26.0/23
 72.139.28.0/23
 72.139.30.0/24
 74.12.192.0/22
 74.14.84.0/22
 74.15.60.0/23
 74.116.120.0/22
 74.205.208.0/20
 75.75.243.0/26
 75.75.244.0/27
 76.67.4.0/22
 76.67.8.0/21
 76.67.16.0/21
 76.67.24.0/21
 76.67.32.0/21
 76.67.44.0/22
 76.67.52.0/22
 76.67.56.0/21
 76.67.64.0/21
 76.67.72.0/21
 76.67.80.0/22
 76.67.92.0/22
 76.67.96.0/21
 76.67.104.0/21
 76.67.112.0/21
 76.67.120.0/21
 76.67.128.0/21
 76.67.152.0/22
 76.67.172.0/22
 76.68.100.0/22
 76.71.154.0/24
 76.71.218.0/24
 96.7.200.0/21
 96.44.192.0/18
 96.125.135.0/24
 98.143.96.0/20
 98.158.129.0/24
 98.159.239.0/24
 99.86.58.0/23
 99.128.0.0/13
 99.137.0.0/16
 99.138.0.0/15
 99.140.0.0/14
 99.144.0.0/15
 99.147.0.0/16
 99.148.0.0/14
 99.152.0.0/14
 99.157.0.0/16
 99.158.0.0/15
 99.160.0.0/15
 99.162.0.0/16
 99.164.0.0/16
 99.242.114.0/24
 104.36.180.0/22
 104.93.171.0/24
 104.167.96.0/19
 104.254.92.0/22
 107.150.224.0/19
 108.162.64.0/18
 108.162.239.0/24
 108.162.240.0/23
 108.162.242.0/24
 119.161.56.0/24
 128.100.0.0/16
 130.12.0.0/16
 131.104.0.0/16
 131.232.0.0/16
 132.145.96.0/20
 134.70.72.0/22
 134.122.39.0/24
 135.0.0.0/16
 136.143.208.0/20
 137.15.0.0/16
 137.122.0.0/16
 137.207.0.0/16
 137.220.54.57/32
 138.51.0.0/16
 140.91.28.0/23
 140.204.0.128/25
 140.238.128.0/19
 142.1.0.0/16
 142.112.11.0/24
 142.112.206.0/24
 142.113.224.0/24
 142.120.226.0/24
 142.150.0.0/15
 142.154.239.0/24
 142.155.0.0/16
 142.183.31.0/24
 142.222.0.0/16
 142.253.0.0/16
 149.99.0.0/17
 149.99.128.0/22
 149.99.132.0/24
 149.99.134.0/23
 149.99.136.0/21
 149.99.144.0/20
 149.99.160.0/21
 149.99.168.0/22
 149.99.173.0/24
 149.99.174.0/23
 149.99.176.0/20
 149.99.192.0/18
 149.248.0.0/18
 149.248.64.0/21
 149.248.136.0/21
 149.248.144.0/20
 149.248.160.0/19
 149.248.192.0/18
 151.101.124.0/22
 151.139.6.0/24
 151.139.36.0/24
 151.139.200.0/24
 155.138.128.0/20
 155.138.144.0/22
 155.138.148.0/23
 155.138.150.0/23
 155.138.152.0/21
 157.185.164.0/24
 158.85.64.0/18
 158.106.121.0/24
 159.89.63.0/24
 159.89.112.0/20
 159.203.0.0/18
 162.125.11.0/24
 162.220.7.0/24
 162.253.71.0/24
 164.178.0.0/16
 165.22.238.0/24
 165.227.32.0/20
 167.99.184.0/24
 168.144.0.0/16
 168.235.144.0/20
 170.199.200.0/24
 172.105.111.0/24
 172.111.135.0/24
 172.111.160.0/24
 172.111.162.0/24
 172.111.177.0/24
 172.111.204.0/23
 173.32.218.0/24
 173.33.184.0/21
 173.33.192.0/21
 173.230.160.0/19
 173.245.112.0/22
 174.88.95.0/24
 174.89.8.0/21
 174.89.20.0/22
 174.89.24.0/21
 174.89.32.0/21
 174.89.40.0/22
 174.89.52.0/22
 174.89.56.0/21
 174.89.64.0/22
 174.89.68.0/24
 174.89.92.0/22
 174.89.100.0/22
 174.89.104.0/21
 174.89.112.0/22
 174.89.120.0/21
 174.89.132.0/22
 174.89.136.0/21
 174.89.144.0/21
 174.89.152.0/21
 174.89.160.0/22
 174.89.168.0/22
 174.89.172.0/22
 174.89.176.0/22
 174.89.192.0/21
 174.89.216.0/22
 174.91.104.0/21
 174.91.112.0/20
 174.91.128.0/17
 174.92.0.0/19
 174.92.32.0/22
 174.92.111.0/24
 174.95.252.0/22
 174.114.107.0/24
 174.138.112.0/22
 178.128.224.0/20
 184.75.208.0/20
 184.86.32.0/20
 184.144.76.0/24
 184.146.168.0/24
 184.148.32.0/22
 184.164.0.0/18
 185.64.102.0/24
 192.12.174.0/24
 192.12.176.0/21
 192.29.8.0/22
 192.75.71.0/24
 192.75.139.0/24
 192.75.254.0/24
 192.82.128.0/22
 192.197.90.0/24
 192.252.160.0/20
 198.55.48.0/20
 198.57.27.0/24
 198.96.84.0/22
 199.7.156.0/22
 199.47.240.0/22
 199.66.88.0/21
 199.127.108.0/22
 199.167.136.0/22
 199.249.112.0/20
 204.187.100.0/23
 205.167.238.0/23
 206.130.160.0/21
 206.130.168.0/22
 206.130.172.0/23
 206.130.174.0/24
 206.130.179.0/25
 206.130.179.128/26
 206.130.179.192/27
 206.130.179.224/28
 206.130.179.240/30
 206.130.179.244/30
 206.130.179.248/29
 206.222.64.0/19
 207.188.72.0/24
 207.189.212.0/23
 207.245.192.0/18
 208.65.72.0/22
 208.65.240.0/21
 208.85.216.0/21
 208.98.222.0/23
 209.15.0.0/20
 209.95.57.0/24
 209.161.234.0/24
 209.205.40.0/24
 209.217.82.0/24
 216.40.32.0/20
 216.48.80.0/20
 216.105.80.0/21
 216.105.88.0/21
 216.151.184.0/24
 216.209.250.0/24
 216.251.32.0/20
--- a/data/country/CA/CA-NS.txt
+++ b/data/country/CA/CA-NS.txt
@@ -1,2 +0,0 @@
 24.224.160.0/24
 142.68.128.0/22
--- a/data/country/CA/CA-NT.txt
+++ b/data/country/CA/CA-NT.txt
@@ -1 +0,0 @@
 207.148.48.0/20
--- a/data/country/CA/CA-QC.txt
+++ b/data/country/CA/CA-QC.txt
@@ -1,898 +0,0 @@
 6.244.192.0/18
 8.7.244.0/24
 8.18.128.0/24
 8.18.136.0/21
 8.18.172.0/24
 8.20.110.0/24
 8.21.41.0/24
 8.46.118.0/24
 13.225.188.0/22
 13.225.192.0/21
 23.16.0.0/16
 23.17.0.0/24
 23.34.192.0/20
 23.74.8.0/22
 23.91.224.0/19
 23.92.128.0/20
 23.177.160.0/24
 23.248.0.0/17
 23.248.128.0/19
 24.50.160.0/19
 24.53.96.0/19
 24.53.240.0/20
 24.54.64.0/19
 24.64.0.0/13
 24.108.0.0/15
 24.122.0.0/18
 24.122.64.0/19
 24.122.96.0/20
 24.140.240.0/20
 24.143.128.0/19
 24.156.160.0/19
 24.224.228.0/24
 24.231.96.0/20
 24.244.0.0/18
 34.95.0.0/18
 35.182.0.0/15
 37.120.130.0/24
 38.15.64.0/18
 38.112.107.0/24
 40.90.130.192/28
 40.90.138.64/27
 40.90.140.0/27
 40.90.147.32/27
 45.3.0.0/19
 45.40.64.0/20
 45.42.72.0/21
 45.42.96.0/19
 45.57.245.0/24
 45.57.246.0/23
 45.58.96.0/20
 45.74.61.0/24
 45.74.64.0/20
 45.74.96.0/19
 50.21.226.0/23
 50.21.228.0/22
 50.21.232.0/22
 50.21.236.0/23
 50.21.238.0/24
 50.64.0.0/16
 50.65.0.0/17
 50.65.132.0/22
 50.65.136.0/21
 50.65.144.0/20
 50.65.160.0/19
 50.65.192.0/18
 50.66.0.0/15
 50.68.0.0/15
 50.70.0.0/16
 50.72.0.0/16
 50.92.0.0/16
 50.93.0.0/17
 50.93.160.0/20
 50.98.0.0/16
 50.99.0.0/24
 51.79.0.0/17
 51.161.35.0/24
 51.222.32.96/28
 51.222.38.40/29
 51.222.103.56/29
 51.222.103.64/32
 52.60.0.0/16
 52.92.84.0/22
 52.124.28.0/24
 52.124.30.0/23
 52.229.64.0/18
 52.232.128.0/21
 52.235.0.0/18
 52.239.164.128/26
 52.239.190.0/25
 52.242.0.0/18
 52.245.32.0/22
 52.253.196.0/22
 54.39.0.0/20
 54.39.16.0/21
 54.39.24.0/25
 54.39.24.128/26
 54.39.24.192/27
 54.39.24.224/28
 54.39.24.240/28
 54.39.25.0/24
 54.39.26.0/23
 54.39.28.0/22
 54.39.32.0/23
 54.39.34.0/26
 54.39.34.64/28
 54.39.34.80/28
 54.39.34.96/27
 54.39.34.128/25
 54.39.35.0/24
 54.39.36.0/22
 54.39.40.0/21
 54.39.48.0/20
 54.39.64.0/18
 54.39.128.0/17
 64.39.160.0/19
 64.45.171.0/24
 64.45.173.0/24
 64.59.128.0/18
 64.114.0.0/20
 64.114.16.0/21
 64.114.24.0/22
 64.114.28.0/23
 64.114.30.0/24
 64.114.32.0/19
 64.114.64.0/18
 64.114.128.0/17
 64.118.224.0/19
 64.140.112.0/20
 64.141.0.0/17
 64.180.0.0/16
 64.251.64.0/19
 64.254.233.0/24
 65.38.64.0/19
 66.11.160.0/19
 66.22.160.0/20
 66.43.48.0/20
 66.49.128.0/18
 66.49.208.0/20
 66.49.224.0/20
 66.49.240.0/21
 66.49.248.0/22
 66.49.255.0/24
 66.70.128.0/17
 66.97.64.0/19
 66.103.192.0/19
 66.110.128.0/19
 66.110.160.0/20
 66.163.64.0/20
 66.171.98.0/23
 66.171.100.0/22
 66.171.104.0/23
 66.171.106.0/24
 66.171.108.0/22
 66.183.0.0/16
 66.203.160.0/19
 66.203.192.0/19
 66.220.192.0/20
 66.222.128.0/17
 66.244.192.0/18
 67.55.2.0/23
 67.55.32.0/19
 67.70.32.0/22
 67.158.64.0/20
 67.204.3.0/24
 67.205.64.0/18
 67.212.10.0/24
 67.216.32.0/19
 67.230.128.0/19
 68.182.0.0/17
 68.182.128.0/18
 68.232.80.0/20
 69.55.240.0/20
 69.63.32.0/19
 69.171.128.0/19
 69.173.32.0/19
 69.194.32.0/19
 69.196.64.0/19
 70.27.192.0/22
 70.27.208.0/20
 70.27.224.0/21
 70.27.236.0/22
 70.27.240.0/20
 70.64.0.0/19
 70.64.32.0/20
 70.64.49.0/24
 70.64.50.0/23
 70.64.52.0/22
 70.64.56.0/21
 70.64.64.0/18
 70.64.128.0/17
 70.65.0.0/16
 70.66.0.0/21
 70.66.8.0/22
 70.66.13.0/24
 70.66.14.0/23
 70.66.16.0/20
 70.66.32.0/19
 70.66.64.0/18
 70.66.128.0/17
 70.67.0.0/16
 70.68.0.0/16
 70.69.0.0/17
 70.69.128.0/19
 71.7.0.0/16
 72.2.0.0/18
 72.9.160.0/19
 72.25.232.0/21
 72.25.240.0/21
 72.53.0.0/17
 72.53.128.0/19
 72.53.192.0/18
 74.3.128.0/18
 74.48.0.0/17
 74.49.0.0/17
 75.152.0.0/17
 75.152.192.0/18
 75.154.64.0/18
 75.154.148.0/22
 75.154.160.0/19
 75.154.192.0/18
 75.155.0.0/16
 75.156.0.0/15
 75.158.0.0/18
 75.158.64.0/19
 75.158.96.0/21
 75.158.104.0/22
 75.158.108.0/23
 75.158.111.0/24
 75.158.112.0/20
 75.158.128.0/19
 75.158.160.0/20
 75.158.192.0/18
 75.159.0.0/16
 76.67.0.0/22
 76.67.48.0/22
 76.67.84.0/22
 76.67.88.0/22
 76.67.136.0/21
 76.67.144.0/21
 76.67.156.0/22
 76.67.160.0/21
 76.67.168.0/22
 76.67.176.0/21
 76.67.188.0/22
 76.67.192.0/20
 76.67.208.0/21
 80.71.32.0/20
 87.101.48.0/20
 94.140.2.0/23
 96.1.0.0/17
 96.1.240.0/22
 96.30.187.0/24
 96.30.188.0/22
 96.46.192.0/20
 96.47.176.0/20
 96.48.0.0/13
 99.79.0.0/16
 99.199.0.0/17
 99.199.128.0/18
 99.199.192.0/20
 99.199.224.0/20
 103.253.96.0/22
 104.142.0.0/17
 104.152.160.0/21
 104.152.210.0/23
 104.153.24.0/22
 104.157.0.0/17
 104.159.0.0/17
 104.163.0.0/17
 104.167.192.0/24
 104.171.48.0/20
 104.193.56.0/21
 104.193.64.0/21
 104.194.32.0/19
 104.205.0.0/16
 104.219.156.0/22
 104.219.200.0/21
 104.243.80.0/20
 104.243.96.0/20
 104.244.64.0/22
 104.255.12.0/22
 107.171.128.0/17
 108.61.118.0/24
 108.61.231.0/24
 108.63.0.0/16
 108.168.0.0/17
 108.170.128.0/18
 108.180.0.0/16
 108.181.0.0/24
 129.97.0.0/16
 131.253.18.0/24
 132.203.0.0/16
 132.204.0.0/16
 132.207.0.0/16
 132.208.0.0/16
 132.214.0.0/16
 132.219.137.0/24
 135.12.128.0/17
 135.84.16.0/20
 137.186.0.0/16
 138.229.16.0/20
 138.229.112.0/20
 140.161.0.0/16
 140.184.0.0/16
 142.2.0.0/16
 142.4.192.0/19
 142.44.128.0/19
 142.44.160.0/23
 142.44.162.0/23
 142.44.164.0/22
 142.44.168.0/21
 142.44.176.0/20
 142.44.192.0/18
 142.58.0.0/16
 142.59.0.0/17
 142.59.128.0/19
 142.59.176.0/20
 142.59.192.0/18
 142.87.0.0/16
 142.90.0.0/18
 142.90.192.0/18
 142.169.0.0/16
 142.179.0.0/16
 142.183.36.0/22
 142.183.40.0/21
 142.183.48.0/20
 142.183.64.0/21
 142.183.72.0/22
 142.183.76.0/23
 142.183.80.0/24
 142.183.82.0/24
 142.183.84.0/24
 142.183.86.0/24
 142.183.88.0/23
 142.204.0.0/16
 142.237.0.0/16
 142.240.254.0/24
 144.194.0.0/20
 144.194.16.0/21
 144.194.32.0/19
 144.194.64.0/18
 144.194.128.0/17
 144.208.96.0/21
 144.208.112.0/22
 144.217.0.0/16
 147.124.64.0/20
 147.160.1.0/24
 148.59.39.0/24
 148.59.228.0/23
 149.56.0.0/19
 149.56.32.0/25
 149.56.32.128/27
 149.56.32.160/29
 149.56.32.168/29
 149.56.32.176/28
 149.56.32.192/26
 149.56.33.0/24
 149.56.34.0/23
 149.56.36.0/22
 149.56.40.0/21
 149.56.48.0/20
 149.56.64.0/18
 149.56.128.0/18
 149.56.192.0/19
 149.56.224.0/20
 149.56.240.0/22
 149.56.244.0/23
 149.56.246.0/26
 149.56.246.64/28
 149.56.246.80/29
 149.56.246.88/29
 149.56.246.96/27
 149.56.246.128/25
 149.56.247.0/24
 149.56.248.0/21
 149.99.172.0/24
 149.248.72.0/21
 149.248.80.0/20
 149.248.96.0/19
 149.248.128.0/21
 151.101.136.0/22
 154.5.0.0/16
 154.11.0.0/16
 154.20.0.0/16
 156.57.0.0/16
 157.185.167.0/24
 158.69.0.0/17
 158.69.128.0/19
 158.69.160.0/23
 158.69.162.0/26
 158.69.162.64/27
 158.69.162.96/29
 158.69.162.104/29
 158.69.162.112/28
 158.69.162.128/25
 158.69.163.0/24
 158.69.164.0/22
 158.69.168.0/21
 158.69.176.0/20
 158.69.192.0/18
 160.32.192.0/19
 161.38.13.0/24
 161.38.15.0/24
 161.38.21.0/24
 161.184.128.0/19
 162.156.0.0/15
 162.158.124.0/22
 162.208.128.0/17
 162.216.136.0/24
 162.218.124.0/23
 162.221.120.0/21
 162.222.80.0/22
 162.246.52.0/22
 162.247.120.0/21
 162.247.224.0/21
 162.250.188.0/22
 162.250.196.0/22
 162.255.112.0/22
 166.48.0.0/16
 167.114.0.0/17
 167.114.128.0/19
 167.114.160.0/20
 167.114.176.0/22
 167.114.180.0/24
 167.114.181.0/25
 167.114.181.128/28
 167.114.181.144/29
 167.114.181.152/29
 167.114.181.160/27
 167.114.181.192/26
 167.114.182.0/23
 167.114.184.0/21
 167.114.192.0/19
 168.91.56.0/21
 169.54.64.0/18
 170.52.64.0/18
 170.133.224.0/19
 172.87.80.0/20
 172.97.128.0/17
 172.98.144.0/20
 172.218.0.0/15
 173.180.0.0/16
 173.181.0.0/17
 173.181.128.0/20
 173.181.148.0/22
 173.181.152.0/21
 173.181.160.0/19
 173.181.192.0/20
 173.181.212.0/22
 173.181.216.0/21
 173.181.224.0/19
 173.182.0.0/17
 173.182.128.0/18
 173.183.0.0/16
 173.206.0.0/16
 173.214.128.0/20
 173.247.128.0/19
 173.247.208.0/20
 174.0.0.0/13
 174.89.0.0/21
 174.89.72.0/21
 174.89.80.0/21
 174.89.88.0/22
 174.89.96.0/22
 174.89.116.0/22
 174.89.164.0/22
 174.89.180.0/22
 174.89.184.0/21
 174.89.200.0/21
 174.89.212.0/22
 174.89.220.0/22
 174.89.224.0/20
 174.89.240.0/21
 174.89.248.0/22
 174.138.192.0/19
 174.142.0.0/16
 180.87.0.0/24
 180.87.1.0/28
 180.87.1.80/28
 180.87.3.0/28
 180.87.3.24/29
 180.87.3.32/28
 180.87.4.16/28
 180.87.5.0/28
 180.87.6.0/24
 180.87.10.0/25
 180.87.10.128/26
 180.87.13.0/24
 180.87.15.26/32
 180.87.24.0/25
 180.87.24.128/27
 180.87.24.176/28
 180.87.24.192/26
 180.87.27.0/24
 180.87.30.0/29
 180.87.30.8/30
 180.87.31.0/24
 180.87.34.0/24
 180.87.36.0/22
 180.87.70.0/24
 180.87.76.0/24
 180.87.88.0/27
 180.87.88.36/30
 180.87.88.40/29
 180.87.88.48/29
 180.87.88.60/30
 180.87.88.64/28
 180.87.88.88/29
 180.87.88.100/30
 180.87.88.104/29
 180.87.88.112/28
 180.87.88.128/28
 180.87.88.144/29
 180.87.88.164/30
 180.87.88.168/29
 180.87.88.176/28
 180.87.88.192/28
 180.87.88.208/30
 180.87.88.220/30
 180.87.88.224/28
 180.87.88.240/30
 180.87.89.0/24
 180.87.90.0/24
 180.87.93.12/30
 180.87.93.16/28
 180.87.93.32/30
 180.87.93.40/30
 180.87.93.48/28
 180.87.93.64/26
 180.87.93.128/25
 180.87.95.0/24
 180.87.99.40/29
 180.87.99.56/30
 180.87.99.168/29
 180.87.99.176/29
 180.87.99.240/28
 180.87.113.0/28
 180.87.113.16/29
 180.87.113.24/30
 180.87.114.0/24
 180.87.118.0/24
 180.87.121.0/24
 180.87.122.0/24
 184.64.0.0/13
 184.107.0.0/16
 184.171.208.0/20
 185.206.25.0/24
 192.26.211.0/24
 192.31.180.0/24
 192.75.240.0/21
 192.77.50.0/23
 192.99.0.0/16
 192.131.249.0/24
 192.136.114.0/23
 192.139.12.0/23
 192.139.14.0/24
 192.139.33.0/24
 192.139.34.0/24
 192.139.36.0/24
 192.139.148.0/24
 192.139.150.0/24
 192.139.213.0/24
 192.139.214.0/24
 192.139.224.0/24
 192.139.245.0/24
 192.155.69.0/24
 192.187.28.0/23
 192.187.30.0/24
 192.197.54.0/24
 192.197.62.0/24
 192.197.95.0/24
 192.197.172.0/24
 192.197.174.0/24
 192.214.128.0/17
 193.149.169.0/24
 198.2.64.0/18
 198.27.64.0/21
 198.27.72.0/24
 198.27.73.0/25
 198.27.73.128/27
 198.27.73.160/29
 198.27.73.168/32
 198.27.73.170/31
 198.27.73.172/30
 198.27.73.176/28
 198.27.73.192/26
 198.27.74.0/23
 198.27.76.0/22
 198.27.80.0/21
 198.27.88.0/22
 198.27.93.0/24
 198.27.94.0/23
 198.27.96.0/21
 198.27.104.0/25
 198.27.104.128/27
 198.27.104.160/28
 198.27.104.176/29
 198.27.104.184/30
 198.27.104.188/30
 198.27.104.192/26
 198.27.105.0/24
 198.27.106.0/23
 198.27.108.0/22
 198.27.112.0/20
 198.50.200.0/24
 198.50.210.144/30
 198.50.216.96/29
 198.50.216.104/31
 198.52.128.0/18
 198.53.0.0/16
 198.73.133.0/24
 198.73.134.0/24
 198.91.128.0/17
 198.96.155.0/24
 198.99.28.0/22
 198.100.144.0/22
 198.100.148.0/27
 198.100.148.32/28
 198.100.148.48/29
 198.100.148.56/31
 198.100.148.58/31
 198.100.148.60/30
 198.100.148.64/26
 198.100.148.128/25
 198.100.149.0/24
 198.100.150.0/23
 198.100.152.0/21
 198.133.121.0/24
 198.135.181.0/24
 198.162.1.0/24
 198.162.22.0/24
 198.166.0.0/17
 198.166.128.0/18
 198.166.192.0/19
 198.166.224.0/21
 198.166.232.0/24
 198.166.234.0/23
 198.166.236.0/22
 198.166.240.0/20
 198.168.44.0/23
 198.168.47.0/24
 198.178.118.0/24
 198.200.64.0/18
 198.232.214.0/23
 199.59.76.0/22
 199.60.0.0/20
 199.60.16.0/23
 199.60.18.0/24
 199.60.144.0/21
 199.71.4.0/22
 199.84.241.0/24
 199.84.242.0/24
 199.126.0.0/16
 199.166.6.0/24
 199.166.210.0/24
 199.167.128.0/22
 199.185.120.0/23
 199.185.122.0/23
 199.185.124.0/23
 199.185.132.0/23
 199.185.192.0/20
 199.187.228.0/22
 199.189.76.0/22
 199.202.204.0/24
 199.212.1.0/24
 199.212.2.0/23
 199.212.8.0/22
 199.212.32.0/22
 199.212.45.0/24
 199.212.53.0/24
 199.212.54.0/23
 199.212.88.0/23
 199.212.152.0/21
 199.231.200.0/21
 199.233.210.0/24
 199.246.38.0/23
 199.247.159.0/24
 204.11.120.0/23
 204.16.56.0/23
 204.19.2.0/23
 204.19.4.0/22
 204.48.0.0/21
 204.68.231.0/24
 204.107.134.0/24
 204.174.56.0/21
 204.174.64.0/22
 204.174.68.0/23
 204.174.120.0/24
 204.174.123.0/24
 204.174.212.0/22
 204.174.216.0/22
 204.191.0.0/16
 204.197.176.0/20
 204.209.16.0/22
 204.209.40.0/23
 204.209.42.0/24
 204.209.208.0/21
 204.239.18.0/24
 204.239.152.0/22
 205.178.163.0/24
 205.178.184.0/24
 205.189.2.0/23
 205.206.0.0/16
 205.207.88.0/23
 205.207.90.0/24
 205.207.178.0/24
 205.209.1.0/24
 205.210.104.0/24
 205.211.2.0/24
 205.211.16.0/21
 205.211.156.0/22
 205.211.163.0/24
 205.211.168.0/23
 205.211.180.0/22
 205.233.150.0/24
 205.236.24.0/23
 205.236.43.0/24
 205.236.80.0/24
 205.236.89.0/24
 205.236.120.0/22
 205.236.226.0/24
 205.250.0.0/16
 206.12.6.0/23
 206.12.10.0/24
 206.12.16.0/23
 206.12.30.0/24
 206.12.120.0/21
 206.47.98.0/24
 206.75.0.0/16
 206.80.240.0/20
 206.108.16.0/20
 206.108.64.0/19
 206.108.192.0/19
 206.116.0.0/16
 206.130.22.0/24
 206.131.224.0/19
 206.162.128.0/18
 206.167.88.0/24
 206.174.192.0/19
 206.176.128.0/19
 206.180.240.0/20
 206.188.64.0/19
 206.253.64.0/20
 207.6.0.0/16
 207.23.85.0/24
 207.23.96.0/20
 207.23.160.0/19
 207.23.192.0/19
 207.34.64.0/18
 207.34.128.0/17
 207.81.0.0/16
 207.102.0.0/16
 207.112.0.0/17
 207.134.0.0/16
 207.148.128.0/18
 207.162.1.0/24
 207.162.7.0/24
 207.162.8.0/24
 207.162.10.0/23
 207.162.25.0/24
 207.162.28.0/23
 207.162.32.0/20
 207.167.192.0/18
 207.194.0.0/16
 207.216.0.0/16
 207.219.0.0/16
 207.228.64.0/18
 207.229.0.0/18
 208.38.0.0/18
 208.52.178.0/24
 208.68.16.0/22
 208.98.192.0/20
 208.98.208.0/21
 208.118.64.0/19
 208.118.96.0/20
 208.118.112.0/22
 208.118.116.0/23
 208.118.118.0/24
 208.118.120.0/21
 208.181.0.0/16
 209.20.0.0/18
 209.29.0.0/16
 209.50.32.0/20
 209.52.0.0/15
 209.58.0.0/20
 209.58.16.0/21
 209.58.25.0/24
 209.58.26.0/23
 209.58.28.0/22
 209.58.32.0/21
 209.58.42.0/23
 209.58.44.0/22
 209.58.48.0/22
 209.58.52.0/23
 209.58.55.0/24
 209.58.56.0/21
 209.58.64.0/21
 209.58.72.0/22
 209.58.76.0/24
 209.58.78.0/23
 209.58.80.0/23
 209.58.83.0/24
 209.58.84.0/22
 209.58.88.0/21
 209.58.96.0/21
 209.58.104.0/24
 209.58.106.0/23
 209.58.108.0/22
 209.58.112.0/21
 209.58.120.0/22
 209.58.124.0/30
 209.58.124.4/31
 209.58.124.7/32
 209.58.124.8/29
 209.58.124.16/28
 209.58.124.32/27
 209.58.124.64/26
 209.58.124.128/25
 209.58.125.0/24
 209.58.126.0/23
 209.87.30.0/23
 209.87.56.0/22
 209.87.60.0/24
 209.89.0.0/16
 209.90.128.0/18
 209.91.64.0/18
 209.104.64.0/18
 209.115.128.0/17
 209.121.0.0/16
 209.128.48.0/24
 209.141.128.0/18
 209.141.192.0/20
 209.162.160.0/20
 209.171.0.0/16
 209.172.32.0/19
 209.182.228.0/22
 209.183.0.0/19
 209.183.128.0/19
 209.195.64.0/18
 209.197.128.0/19
 209.197.160.0/20
 209.197.176.0/21
 209.197.188.0/22
 209.202.64.0/18
 209.202.192.0/19
 209.204.192.0/19
 209.213.224.0/19
 209.225.128.0/18
 209.227.129.0/24
 209.239.0.0/19
 213.179.192.0/24
 216.6.0.0/21
 216.6.8.0/22
 216.6.12.0/24
 216.6.14.0/23
 216.6.16.0/20
 216.6.32.0/20
 216.6.48.0/22
 216.6.52.0/23
 216.6.54.0/24
 216.6.56.0/23
 216.6.58.0/24
 216.6.60.0/22
 216.6.65.0/24
 216.6.66.0/23
 216.6.68.0/22
 216.6.72.0/21
 216.6.81.0/24
 216.6.82.0/23
 216.6.84.0/22
 216.6.88.0/23
 216.6.90.0/24
 216.6.92.0/22
 216.6.96.0/20
 216.6.112.0/21
 216.6.120.0/24
 216.6.122.0/23
 216.6.124.0/22
 216.21.233.0/24
 216.48.160.0/20
 216.58.0.0/17
 216.59.224.0/19
 216.75.160.0/19
 216.123.192.0/18
 216.126.42.0/23
 216.165.192.0/19
 216.181.0.0/16
 216.198.128.0/19
 216.208.235.0/27
 216.212.192.0/19
 216.218.0.0/18
 216.226.32.0/19
 216.232.0.0/16
 216.239.64.0/19
 216.246.224.0/19
 216.254.128.0/18
 216.254.192.0/19
 217.138.200.0/24
--- a/data/country/CA/CA-SK.txt
+++ b/data/country/CA/CA-SK.txt
@@ -1,7 +0,0 @@
 108.60.160.0/19
 142.3.0.0/16
 142.165.176.0/22
 142.165.181.0/24
 142.165.184.0/21
 142.165.192.0/22
 198.169.20.0/24
--- a/data/country/CN.txt
+++ b/data/country/CN.txt
@@ -22769,7 +22769,12 @@
 59.81.104.0/21
 59.81.112.0/20
 59.81.128.0/17
-59.82.0.0/16
+59.82.0.0/18
 59.82.64.0/19
 59.82.96.0/20
 59.82.112.0/21
 59.82.120.0/21
 59.82.128.0/17
 59.83.0.0/18
 59.83.130.0/23
 59.83.132.0/22
@@ -107344,7 +107349,12 @@
 223.120.64.0/18
 223.120.128.0/17
 223.121.0.0/16
-223.122.0.0/15
+223.122.0.0/20
 223.122.18.0/23
 223.122.20.0/22
 223.122.26.0/23
 223.122.28.0/22
 223.123.0.0/16
 223.124.0.0/14
 223.128.0.0/17
 223.128.128.0/19
--- a/data/country/CN/CN-HE.txt
+++ b/data/country/CN/CN-HE.txt
@@ -670,6 +670,7 @@
 59.67.224.0/20
 59.67.240.0/21
 59.81.16.0/23
 59.82.120.0/23
 59.108.153.224/28
 60.0.0.0/14
 60.4.0.0/16
--- a/data/country/CN/CN-HK.txt
+++ b/data/country/CN/CN-HK.txt
@@ -1,8 +0,0 @@
 63.218.252.0/22
 116.251.73.104/30
 116.251.74.218/31
 118.143.230.0/23
 139.159.48.0/22
 202.95.12.0/22
 203.100.50.0/24
 219.234.8.0/23
--- a/data/country/CN/CN-ZJ.txt
+++ b/data/country/CN/CN-ZJ.txt
@@ -873,7 +873,13 @@
 58.100.0.0/15
 58.195.248.0/21
 58.205.200.0/21
-59.82.0.0/16
+59.82.0.0/18
 59.82.64.0/19
 59.82.96.0/20
 59.82.112.0/21
 59.82.122.0/23
 59.82.124.0/22
 59.82.128.0/17
 59.111.0.0/16
 60.12.0.0/20
 60.12.16.0/22
--- a/data/country/DE/DE-BB.txt
+++ b/data/country/DE/DE-BB.txt
@@ -1,6 +0,0 @@
 83.221.230.0/24
 141.43.0.0/16
 141.89.0.0/16
 217.234.91.0/24
 217.234.92.0/23
 217.234.94.0/24
--- a/data/country/DE/DE-BE.txt
+++ b/data/country/DE/DE-BE.txt
@@ -1,46 +0,0 @@
 4.68.14.34/31
 4.69.158.18/31
 4.69.158.22/31
 4.69.158.26/31
 4.69.158.30/31
 4.69.161.0/28
 8.44.0.0/24
 8.238.12.0/23
 45.84.102.0/24
 62.78.16.0/21
 62.78.24.0/23
 62.141.32.0/21
 62.141.40.0/23
 62.141.42.0/24
 62.141.43.0/25
 81.169.128.0/20
 81.169.144.0/21
 81.169.152.0/22
 81.169.156.0/24
 82.83.226.0/24
 82.165.128.0/20
 84.59.43.0/24
 85.214.16.0/20
 85.214.32.0/19
 85.214.64.0/18
 85.214.128.0/21
 85.214.136.0/22
 92.122.49.0/24
 130.133.0.0/16
 130.149.0.0/16
 134.30.0.0/16
 141.20.0.0/16
 141.23.0.0/16
 141.45.0.0/16
 160.45.0.0/16
 185.60.84.0/24
 185.177.204.0/22
 194.122.82.0/24
 195.37.138.0/24
 217.49.0.0/16
 217.70.129.240/28
 217.80.31.0/24
 217.80.32.0/24
 217.91.22.0/24
 217.199.70.0/24
 217.224.218.0/24
--- a/data/country/DE/DE-BW.txt
+++ b/data/country/DE/DE-BW.txt
@@ -1,31 +0,0 @@
 82.165.64.0/18
 109.239.62.0/24
 129.13.0.0/16
 129.69.0.0/16
 129.206.0.0/16
 132.230.0.0/16
 134.2.0.0/16
 134.34.0.0/16
 134.60.0.0/16
 134.108.0.0/16
 134.155.0.0/16
 141.7.0.0/16
 141.10.0.0/16
 141.18.0.0/15
 141.37.0.0/16
 141.47.0.0/16
 141.58.0.0/16
 141.70.0.0/16
 141.79.0.0/16
 145.254.0.0/16
 147.142.0.0/16
 161.42.0.0/16
 193.196.136.0/21
 193.196.158.0/23
 193.196.165.0/24
 193.197.157.0/24
 195.226.105.64/26
 212.144.123.0/24
 213.23.38.0/23
 213.23.40.0/21
 213.23.48.0/22
--- a/data/country/DE/DE-BY.txt
+++ b/data/country/DE/DE-BY.txt
@@ -1,141 +0,0 @@
 2.17.112.0/22
 5.9.0.0/20
 5.9.16.0/21
 5.9.24.0/22
 5.9.28.0/26
 5.9.28.64/28
 5.9.28.80/29
 5.9.28.88/30
 5.9.28.92/30
 5.9.28.96/27
 5.9.28.128/25
 5.9.29.0/24
 5.9.30.0/23
 5.9.32.0/19
 5.9.64.0/18
 5.9.128.0/17
 8.41.5.0/24
 46.4.0.0/16
 49.12.124.0/24
 62.116.128.0/19
 62.245.128.0/17
 78.46.206.0/24
 84.136.0.0/13
 84.144.0.0/12
 84.160.0.0/11
 85.10.192.0/22
 85.10.196.0/23
 85.10.198.0/24
 85.10.199.0/25
 85.10.199.128/26
 85.10.199.192/28
 85.10.199.208/29
 85.10.199.216/32
 85.10.199.218/31
 85.10.199.220/30
 85.10.199.224/27
 85.10.200.0/21
 85.10.208.0/21
 88.198.0.0/16
 88.217.226.0/23
 89.14.0.0/16
 92.122.24.0/22
 92.122.96.0/22
 93.192.0.0/11
 94.130.184.0/24
 116.202.0.0/16
 129.187.0.0/16
 131.159.0.0/16
 132.199.0.0/16
 132.231.0.0/16
 137.193.0.0/16
 137.250.0.0/15
 138.244.0.0/15
 138.246.0.0/16
 141.22.0.0/16
 141.60.0.0/16
 141.75.0.0/16
 141.82.0.0/20
 141.82.16.0/21
 141.82.24.0/24
 141.82.25.0/25
 141.82.25.128/26
 141.82.25.192/29
 141.82.25.200/32
 141.82.25.202/31
 141.82.25.204/30
 141.82.25.208/28
 141.82.25.224/27
 141.82.26.0/23
 141.82.28.0/22
 141.82.32.0/19
 141.82.64.0/18
 141.82.128.0/17
 159.69.0.0/16
 167.86.67.0/24
 167.86.90.0/23
 172.111.144.0/24
 173.212.192.0/19
 176.9.0.0/16
 178.63.0.0/16
 185.103.8.0/22
 185.177.20.0/24
 185.220.100.0/24
 195.37.17.0/24
 195.37.39.0/24
 195.37.42.0/23
 195.37.64.0/24
 195.201.0.0/16
 212.34.174.160/29
 213.133.96.0/20
 213.239.192.0/21
 213.239.200.0/23
 213.239.202.0/24
 213.239.203.0/25
 213.239.203.128/28
 213.239.203.144/29
 213.239.203.152/30
 213.239.203.156/31
 213.239.203.159/32
 213.239.203.160/27
 213.239.203.192/26
 213.239.204.0/22
 213.239.208.0/20
 213.239.224.0/28
 213.239.224.16/29
 213.239.224.24/31
 213.239.224.27/32
 213.239.224.28/30
 213.239.224.32/31
 213.239.224.35/32
 213.239.224.36/31
 213.239.224.39/32
 213.239.224.40/30
 213.239.224.44/31
 213.239.224.47/32
 213.239.224.48/28
 213.239.224.64/26
 213.239.224.128/30
 213.239.224.132/31
 213.239.224.135/32
 213.239.224.136/31
 213.239.224.139/32
 213.239.224.140/31
 213.239.224.143/32
 213.239.224.144/31
 213.239.224.147/32
 213.239.224.148/30
 213.239.224.152/29
 213.239.224.160/27
 213.239.224.192/26
 213.239.225.0/24
 213.239.226.0/23
 213.239.228.0/22
 213.239.232.0/24
 213.239.233.0/25
 213.239.233.128/26
 213.239.233.192/27
 213.239.233.224/28
 213.239.233.240/29
 213.239.234.0/23
 213.239.236.0/22
--- a/data/country/DE/DE-HB.txt
+++ b/data/country/DE/DE-HB.txt
@@ -1,8 +0,0 @@
 134.102.0.0/16
 193.97.251.0/24
 195.37.48.0/23
 195.50.165.0/24
 195.90.13.0/24
 212.201.44.0/22
 212.201.48.0/23
 213.168.199.0/24
--- a/data/country/DE/DE-HE.txt
+++ b/data/country/DE/DE-HE.txt
@@ -1,305 +0,0 @@
 3.120.0.0/13
 4.68.4.10/32
 4.68.12.68/32
 4.68.12.118/32
 4.68.14.29/32
 4.68.14.30/32
 4.68.24.32/27
 4.68.25.8/29
 4.68.60.216/29
 4.68.60.224/28
 4.68.70.156/30
 4.68.72.96/30
 4.68.186.64/27
 4.69.130.76/30
 4.69.130.84/31
 4.69.154.0/24
 4.69.159.32/29
 5.101.109.0/24
 5.101.160.0/21
 5.154.136.0/22
 5.154.144.0/20
 5.253.37.0/24
 8.12.207.0/24
 8.13.128.130/31
 8.18.50.0/24
 8.39.144.0/24
 8.43.121.0/24
 8.209.64.0/24
 8.254.74.0/24
 18.184.0.0/15
 18.194.0.0/15
 18.196.0.0/15
 23.0.32.0/20
 23.53.168.0/22
 23.90.144.0/20
 23.251.112.0/24
 31.3.2.0/24
 31.22.108.0/24
 34.107.0.0/17
 35.156.0.0/14
 35.235.32.0/20
 37.58.48.0/20
 38.28.1.13/32
 38.28.1.20/32
 38.88.16.68/30
 38.123.104.0/21
 43.131.0.0/18
 43.132.43.0/24
 43.132.44.0/22
 43.132.48.0/21
 43.152.26.0/23
 43.152.44.0/23
 43.152.70.0/23
 43.157.0.0/17
 43.158.0.0/17
 43.230.136.0/24
 43.230.139.0/24
 43.251.160.0/22
 45.32.152.0/21
 45.63.116.0/22
 45.74.4.0/24
 45.76.80.0/20
 45.77.52.0/22
 45.77.64.0/22
 45.77.140.0/22
 45.86.232.0/24
 45.137.216.0/22
 45.138.96.0/25
 45.138.96.128/26
 45.138.96.192/27
 45.138.96.224/29
 45.138.96.232/30
 45.138.96.236/30
 45.138.96.240/28
 45.138.97.0/24
 46.101.68.0/22
 46.101.96.0/19
 46.101.128.0/17
 47.89.80.0/23
 47.89.93.0/24
 47.246.43.0/24
 47.246.88.0/24
 49.51.128.0/19
 49.51.160.0/20
 50.3.72.0/22
 51.4.0.0/16
 51.8.0.0/16
 52.28.0.0/15
 52.57.0.0/16
 52.58.0.0/15
 52.92.68.0/22
 54.93.0.0/16
 54.231.192.0/20
 62.113.192.0/18
 77.81.1.0/24
 80.81.192.0/20
 80.240.16.0/20
 82.98.78.0/24
 82.115.30.0/24
 82.129.28.0/22
 84.129.216.0/29
 84.129.216.9/32
 84.129.216.10/31
 84.129.216.12/30
 84.129.216.16/28
 84.129.216.32/27
 84.129.216.64/26
 84.129.216.128/25
 85.93.5.0/24
 89.34.111.0/24
 89.34.171.0/24
 89.146.192.0/18
 91.108.42.0/23
 91.108.48.0/22
 91.108.53.0/24
 91.108.54.0/23
 91.108.64.0/19
 91.210.226.0/23
 92.122.28.0/22
 92.122.44.0/22
 92.122.102.0/23
 92.122.104.0/22
 92.122.144.0/21
 92.122.152.0/22
 92.122.160.0/21
 92.122.168.0/22
 92.122.212.0/22
 92.122.216.0/23
 92.122.244.0/22
 92.122.248.0/22
 92.122.252.0/23
 92.123.224.0/23
 93.91.80.0/20
 94.24.36.0/24
 101.33.10.0/23
 107.150.117.0/24
 107.150.222.0/23
 107.155.4.0/24
 107.155.16.0/24
 108.61.112.0/23
 108.61.170.0/23
 108.61.178.0/23
 108.61.190.0/24
 108.61.210.0/23
 118.193.58.0/23
 129.250.4.162/32
 129.250.9.153/32
 130.61.8.0/21
 130.61.16.0/20
 130.61.32.0/19
 130.61.64.0/18
 130.61.128.0/17
 130.83.0.0/16
 131.188.0.0/16
 132.145.224.0/19
 134.176.0.0/16
 134.209.224.0/20
 137.248.0.0/16
 138.68.64.0/19
 138.68.96.0/20
 138.68.112.0/22
 138.68.117.0/24
 138.68.118.0/23
 138.68.124.0/22
 139.59.128.0/19
 139.59.204.0/22
 139.59.208.0/21
 139.159.50.0/24
 139.162.128.0/18
 140.82.121.0/24
 141.2.0.0/16
 141.67.0.0/16
 141.98.136.0/22
 141.100.0.0/16
 142.93.96.0/20
 143.204.208.0/21
 148.153.35.0/24
 149.6.42.54/32
 149.154.159.0/24
 151.101.12.0/22
 151.101.114.0/24
 157.230.96.0/19
 159.89.0.0/19
 159.89.59.0/24
 159.89.96.0/20
 159.122.64.0/18
 160.20.145.0/24
 162.62.48.0/20
 162.62.64.0/20
 162.62.96.0/19
 162.62.128.0/23
 162.62.132.0/22
 162.62.136.0/21
 162.62.145.0/24
 162.62.146.0/23
 162.62.148.0/22
 162.62.152.0/24
 162.62.208.0/20
 162.62.224.0/21
 162.62.232.0/23
 162.62.234.0/24
 162.62.236.0/22
 162.125.66.0/24
 162.158.82.0/23
 162.158.84.0/22
 162.158.88.0/21
 162.254.197.0/24
 165.22.80.0/20
 165.227.128.0/19
 165.227.160.0/20
 165.227.244.0/22
 167.99.128.0/20
 167.172.160.0/20
 169.197.100.0/24
 169.197.102.0/23
 169.197.104.0/23
 169.197.106.0/24
 172.70.251.135/32
 172.104.128.0/19
 172.104.224.0/19
 172.105.64.0/19
 172.111.188.0/24
 172.111.200.0/24
 172.111.203.0/24
 172.111.229.0/24
 173.194.2.0/24
 173.194.6.0/24
 185.10.104.0/24
 185.103.51.0/24
 185.114.226.0/24
 185.120.22.0/24
 185.170.42.0/24
 185.177.21.0/24
 185.177.81.0/24
 185.203.206.0/24
 185.207.112.0/22
 185.232.59.0/24
 188.122.68.0/24
 188.166.160.0/21
 188.166.192.0/22
 188.214.93.0/24
 191.96.0.0/24
 191.96.74.0/24
 191.96.110.0/24
 191.96.119.0/24
 191.96.120.0/23
 191.96.154.0/24
 191.96.167.0/24
 191.96.192.0/24
 191.96.195.0/24
 191.96.211.0/24
 191.96.224.0/24
 191.96.240.0/22
 191.96.250.0/23
 191.96.252.0/23
 191.101.64.0/19
 191.101.96.0/20
 191.101.112.0/22
 191.101.116.0/23
 191.101.119.0/24
 191.101.121.0/24
 191.101.122.0/23
 191.101.124.0/22
 191.101.129.0/24
 191.101.131.0/24
 191.101.132.0/23
 191.101.134.0/24
 191.101.146.0/23
 191.101.164.0/23
 191.101.182.0/24
 191.101.198.0/23
 191.101.200.0/23
 191.101.209.0/24
 191.101.216.0/24
 191.101.218.0/23
 191.101.220.0/23
 191.101.222.0/24
 191.101.252.0/24
 192.253.243.0/24
 193.105.74.0/24
 194.50.187.0/24
 194.122.81.0/24
 195.27.31.0/24
 195.122.169.0/26
 195.122.180.0/22
 198.177.125.0/24
 199.247.0.0/21
 199.247.16.0/21
 202.163.2.0/23
 203.205.154.0/24
 203.205.224.0/24
 208.69.33.0/24
 209.250.232.0/21
 212.201.0.0/20
 212.201.16.0/23
 212.201.18.0/24
 213.183.36.0/22
 213.183.40.0/24
 213.183.42.0/23
 213.183.44.0/24
 213.183.47.0/24
 213.183.49.0/24
 213.183.60.0/23
 213.226.68.0/24
 217.61.104.0/21
--- a/data/country/DE/DE-HH.txt
+++ b/data/country/DE/DE-HH.txt
@@ -1,5 +0,0 @@
 8.42.54.0/24
 134.28.0.0/16
 134.100.0.0/16
 194.122.80.0/24
 217.186.125.0/24
--- a/data/country/DE/DE-MV.txt
+++ b/data/country/DE/DE-MV.txt
@@ -1,3 +0,0 @@
 212.201.36.0/23
 212.201.38.0/24
 217.234.101.0/24
--- a/data/country/DE/DE-NI.txt
+++ b/data/country/DE/DE-NI.txt
@@ -1,13 +0,0 @@
 89.182.158.0/24
 89.183.5.0/24
 130.75.0.0/16
 134.103.0.0/16
 134.169.0.0/16
 139.174.0.0/16
 141.71.0.0/16
 141.87.0.0/16
 213.23.245.0/24
 217.94.0.0/16
 217.186.216.0/24
 217.227.67.0/24
 217.236.0.0/16
--- a/data/country/DE/DE-NW.txt
+++ b/data/country/DE/DE-NW.txt
@@ -1,81 +0,0 @@
 4.23.47.0/24
 4.55.88.0/22
 4.68.14.8/32
 4.69.139.0/26
 4.69.158.2/31
 4.69.158.6/31
 4.69.158.10/31
 4.69.158.14/31
 8.27.130.0/23
 8.27.132.0/22
 8.27.136.0/23
 8.27.138.0/24
 8.42.126.40/29
 8.42.127.192/26
 8.43.122.0/24
 8.47.156.0/23
 8.254.124.0/23
 8.254.126.0/24
 8.254.154.0/24
 38.28.1.38/32
 82.82.120.0/21
 82.82.128.0/23
 82.82.130.0/24
 82.83.2.0/23
 82.83.4.0/22
 82.83.8.0/21
 82.83.16.0/20
 82.83.32.0/21
 82.83.40.0/24
 82.83.62.0/23
 82.83.64.0/18
 82.83.128.0/19
 82.83.160.0/20
 82.83.176.0/21
 82.83.184.0/22
 83.169.54.0/23
 84.60.6.0/23
 84.60.8.0/21
 84.60.16.0/20
 84.60.32.0/19
 84.60.64.0/19
 84.60.96.0/22
 84.60.100.0/24
 84.61.2.0/24
 84.61.11.0/24
 84.61.168.0/24
 89.247.0.0/17
 128.176.0.0/16
 129.217.0.0/16
 131.220.0.0/16
 131.234.0.0/16
 132.176.0.0/16
 132.252.0.0/16
 134.61.0.0/16
 134.91.0.0/16
 134.95.0.0/16
 134.99.0.0/16
 134.147.0.0/16
 137.226.0.0/16
 141.99.0.0/16
 146.0.0.0/23
 193.23.168.0/22
 193.25.16.0/20
 195.37.4.0/23
 195.37.6.0/24
 195.37.18.0/23
 195.37.20.0/22
 195.37.224.0/22
 195.158.137.0/24
 195.158.138.0/23
 195.158.140.0/22
 195.158.144.0/22
 195.158.148.0/24
 213.128.125.0/24
 213.128.126.0/23
 213.168.118.0/24
 217.80.30.0/24
 217.224.146.0/24
 217.226.8.0/22
 217.226.12.0/23
 217.226.14.0/24
--- a/data/country/DE/DE-RP.txt
+++ b/data/country/DE/DE-RP.txt
@@ -1,6 +0,0 @@
 136.199.0.0/16
 141.26.0.0/16
 143.93.0.0/16
 144.41.0.0/16
 147.172.0.0/16
 217.86.169.0/24
--- a/data/country/DE/DE-SH.txt
+++ b/data/country/DE/DE-SH.txt
@@ -1,6 +0,0 @@
 82.197.130.0/24
 91.6.249.0/24
 134.245.0.0/16
 141.83.0.0/16
 195.37.66.0/24
 213.39.232.0/23
--- a/data/country/DE/DE-SL.txt
+++ b/data/country/DE/DE-SL.txt
@@ -1 +0,0 @@
 134.96.0.0/16
--- a/data/country/DE/DE-SN.txt
+++ b/data/country/DE/DE-SN.txt
@@ -1,39 +0,0 @@
 82.82.221.0/24
 88.99.0.0/19
 88.99.32.0/26
 88.99.32.64/28
 88.99.32.80/29
 88.99.32.88/30
 88.99.32.92/32
 88.99.32.94/31
 88.99.32.96/27
 88.99.32.128/25
 88.99.33.0/24
 88.99.34.0/23
 88.99.36.0/22
 88.99.40.0/21
 88.99.48.0/20
 88.99.64.0/18
 88.99.128.0/19
 88.99.160.0/21
 88.99.168.0/22
 88.99.172.0/23
 88.99.174.0/28
 88.99.174.16/30
 88.99.174.20/31
 88.99.174.23/32
 88.99.174.24/29
 88.99.174.32/27
 88.99.174.64/26
 88.99.174.128/25
 88.99.175.0/24
 88.99.176.0/20
 88.99.192.0/18
 134.109.0.0/16
 141.30.0.0/16
 141.32.0.0/16
 141.46.0.0/16
 141.56.0.0/15
 141.76.0.0/16
 144.76.0.0/16
 148.251.0.0/16
--- a/data/country/DE/DE-ST.txt
+++ b/data/country/DE/DE-ST.txt
@@ -1,2 +0,0 @@
 51.5.0.0/16
 94.223.144.0/24
--- a/data/country/DE/DE-TH.txt
+++ b/data/country/DE/DE-TH.txt
@@ -1,4 +0,0 @@
 81.7.17.0/24
 141.35.0.0/16
 185.176.160.0/22
 195.37.88.0/23
--- a/data/country/HK.txt
+++ b/data/country/HK.txt
@@ -1070,6 +1070,7 @@
 43.251.228.0/22
 43.251.236.0/22
 43.251.248.0/22
 43.252.52.0/22
 43.252.148.0/24
 43.252.160.0/20
 43.252.176.0/22
@@ -1511,10 +1512,34 @@
 57.96.32.0/19
 57.96.64.0/20
 58.64.128.0/17
-58.82.228.0/24
+58.82.192.0/23
-58.82.232.0/23
+58.82.194.0/23
-58.82.234.0/24
+58.82.196.0/23
-58.82.248.0/24
+58.82.198.0/23
 58.82.200.0/23
 58.82.202.0/23
 58.82.204.0/23
 58.82.206.0/23
 58.82.208.0/23
 58.82.210.0/23
 58.82.212.0/23
 58.82.214.0/23
 58.82.216.0/22
 58.82.220.0/23
 58.82.222.0/23
 58.82.224.0/22
 58.82.228.0/22
 58.82.232.0/22
 58.82.236.0/23
 58.82.238.0/23
 58.82.240.0/23
 58.82.242.0/23
 58.82.244.0/23
 58.82.246.0/23
 58.82.248.0/23
 58.82.250.0/23
 58.82.252.0/23
 58.82.254.0/23
 58.84.5.0/24
 58.84.6.0/23
 58.84.52.0/22
@@ -2405,7 +2430,8 @@
 103.15.26.0/23
 103.15.28.0/22
 103.15.38.0/24
-103.15.84.0/22
+103.15.84.0/23
 103.15.86.0/23
 103.15.104.0/22
 103.15.120.0/22
 103.15.132.0/22
@@ -4193,7 +4219,13 @@
 123.108.254.193/32
 123.108.254.210/32
 123.108.254.221/32
-123.136.0.0/20
+123.136.0.0/23
 123.136.2.0/23
 123.136.4.0/22
 123.136.8.0/23
 123.136.10.0/23
 123.136.12.0/23
 123.136.14.0/23
 123.136.80.0/20
 123.176.96.0/21
 123.202.0.0/15
@@ -4804,7 +4836,118 @@
 160.238.34.0/23
 160.238.58.0/23
 160.238.84.0/22
-161.81.0.0/16
+161.81.0.0/23
 161.81.2.0/23
 161.81.4.0/23
 161.81.6.0/23
 161.81.8.0/22
 161.81.12.0/23
 161.81.14.0/23
 161.81.16.0/23
 161.81.18.0/23
 161.81.20.0/23
 161.81.22.0/23
 161.81.24.0/21
 161.81.32.0/23
 161.81.34.0/23
 161.81.36.0/23
 161.81.38.0/23
 161.81.40.0/22
 161.81.44.0/23
 161.81.46.0/23
 161.81.48.0/23
 161.81.50.0/23
 161.81.52.0/22
 161.81.56.0/23
 161.81.58.0/23
 161.81.60.0/23
 161.81.62.0/23
 161.81.64.0/23
 161.81.66.0/23
 161.81.68.0/22
 161.81.72.0/23
 161.81.74.0/23
 161.81.76.0/23
 161.81.78.0/23
 161.81.80.0/22
 161.81.84.0/23
 161.81.86.0/23
 161.81.88.0/23
 161.81.90.0/23
 161.81.92.0/23
 161.81.94.0/23
 161.81.96.0/23
 161.81.98.0/23
 161.81.100.0/23
 161.81.102.0/23
 161.81.104.0/23
 161.81.106.0/23
 161.81.108.0/23
 161.81.110.0/23
 161.81.112.0/23
 161.81.114.0/23
 161.81.116.0/23
 161.81.118.0/23
 161.81.120.0/23
 161.81.122.0/23
 161.81.124.0/22
 161.81.128.0/23
 161.81.130.0/23
 161.81.132.0/23
 161.81.134.0/23
 161.81.136.0/23
 161.81.138.0/23
 161.81.140.0/22
 161.81.144.0/23
 161.81.146.0/23
 161.81.148.0/23
 161.81.150.0/23
 161.81.152.0/22
 161.81.156.0/23
 161.81.158.0/23
 161.81.160.0/23
 161.81.162.0/23
 161.81.164.0/23
 161.81.166.0/23
 161.81.168.0/23
 161.81.170.0/23
 161.81.172.0/23
 161.81.174.0/23
 161.81.176.0/22
 161.81.180.0/23
 161.81.182.0/23
 161.81.184.0/23
 161.81.186.0/23
 161.81.188.0/23
 161.81.190.0/23
 161.81.192.0/23
 161.81.194.0/23
 161.81.196.0/23
 161.81.198.0/23
 161.81.200.0/23
 161.81.202.0/23
 161.81.204.0/23
 161.81.206.0/23
 161.81.208.0/23
 161.81.210.0/23
 161.81.212.0/23
 161.81.214.0/23
 161.81.216.0/22
 161.81.220.0/22
 161.81.224.0/23
 161.81.226.0/23
 161.81.228.0/23
 161.81.230.0/23
 161.81.232.0/23
 161.81.234.0/23
 161.81.236.0/23
 161.81.238.0/23
 161.81.240.0/23
 161.81.242.0/23
 161.81.244.0/22
 161.81.248.0/23
 161.81.250.0/23
 161.81.252.0/22
 161.123.160.0/19
 161.123.192.0/19
 161.202.32.0/19
@@ -5522,7 +5665,18 @@
 182.236.240.0/20
 182.237.0.0/22
 182.239.48.0/20
-182.239.64.0/18
+182.239.64.0/23
 182.239.66.0/23
 182.239.68.0/23
 182.239.70.0/23
 182.239.72.0/21
 182.239.80.0/20
 182.239.96.0/23
 182.239.98.0/23
 182.239.100.0/23
 182.239.102.0/23
 182.239.104.0/21
 182.239.112.0/20
 182.255.24.0/22
 182.255.32.0/24
 182.255.35.0/24
@@ -6497,7 +6651,14 @@
 203.132.192.0/20
 203.135.128.0/19
 203.142.88.0/21
-203.142.96.0/19
+203.142.96.0/21
 203.142.104.0/22
 203.142.108.0/23
 203.142.110.0/23
 203.142.112.0/21
 203.142.120.0/22
 203.142.124.0/23
 203.142.126.0/23
 203.145.64.0/19
 203.147.110.0/23
 203.153.4.0/23
@@ -7180,6 +7341,69 @@
 223.120.2.81/32
 223.120.2.85/32
 223.120.2.118/32
 223.122.16.0/23
 223.122.24.0/23
 223.122.32.0/23
 223.122.34.0/23
 223.122.36.0/23
 223.122.38.0/23
 223.122.40.0/22
 223.122.44.0/23
 223.122.46.0/23
 223.122.48.0/23
 223.122.50.0/23
 223.122.52.0/23
 223.122.54.0/23
 223.122.56.0/23
 223.122.58.0/23
 223.122.60.0/23
 223.122.62.0/23
 223.122.64.0/23
 223.122.66.0/23
 223.122.68.0/23
 223.122.70.0/23
 223.122.72.0/23
 223.122.74.0/23
 223.122.76.0/23
 223.122.78.0/23
 223.122.80.0/23
 223.122.82.0/23
 223.122.84.0/23
 223.122.86.0/23
 223.122.88.0/23
 223.122.90.0/23
 223.122.92.0/23
 223.122.94.0/23
 223.122.96.0/23
 223.122.98.0/23
 223.122.100.0/22
 223.122.104.0/23
 223.122.106.0/23
 223.122.108.0/23
 223.122.110.0/23
 223.122.112.0/22
 223.122.116.0/23
 223.122.118.0/23
 223.122.120.0/23
 223.122.122.0/23
 223.122.124.0/23
 223.122.126.0/23
 223.122.128.0/22
 223.122.132.0/22
 223.122.136.0/22
 223.122.140.0/23
 223.122.142.0/23
 223.122.144.0/20
 223.122.160.0/19
 223.122.192.0/23
 223.122.194.0/23
 223.122.196.0/23
 223.122.198.0/23
 223.122.200.0/23
 223.122.202.0/23
 223.122.204.0/22
 223.122.208.0/20
 223.122.224.0/19
 223.130.32.0/19
 223.197.0.0/16
 223.223.216.0/22
--- a/data/country/IE.txt
+++ b/data/country/IE.txt
@@ -198,7 +198,8 @@
 31.7.48.0/21
 31.13.24.0/21
 31.13.67.0/24
-31.13.68.0/22
+31.13.68.0/23
 31.13.71.0/24
 31.13.73.0/24
 31.13.74.0/24
 31.13.76.0/23
--- a/data/country/JP.txt
+++ b/data/country/JP.txt
@@ -1057,7 +1057,6 @@
 43.251.117.0/24
 43.252.40.0/22
 43.252.50.0/23
 43.252.52.0/22
 43.252.56.0/22
 43.252.132.0/22
 43.252.149.0/24
@@ -1353,8 +1352,6 @@
 58.65.32.0/19
 58.70.0.0/16
 58.80.0.0/15
 58.82.203.0/24
 58.82.204.0/24
 58.84.240.0/23
 58.84.243.0/24
 58.84.244.0/22
--- a/data/country/JP/JP-13.txt
+++ b/data/country/JP/JP-13.txt
@@ -407,8 +407,6 @@
 54.240.188.0/23
 54.248.0.0/15
 54.250.0.0/16
 58.82.203.0/24
 58.82.204.0/24
 58.93.41.0/24
 58.138.0.0/17
 58.138.128.0/18
--- a/data/country/KP/KP-01.txt
+++ b/data/country/KP/KP-01.txt
@@ -1,12 +0,0 @@
 175.45.176.0/27
 175.45.176.32/28
 175.45.176.48/29
 175.45.176.56/29
 175.45.176.64/30
 175.45.176.68/30
 175.45.176.72/29
 175.45.176.80/28
 175.45.176.96/27
 175.45.176.128/25
 175.45.177.0/24
 175.45.178.0/23
--- a/data/country/KR.txt
+++ b/data/country/KR.txt
@@ -483,7 +483,6 @@
 58.29.0.0/16
 58.65.64.0/18
 58.72.0.0/13
 58.82.226.0/23
 58.84.44.0/22
 58.87.32.0/19
 58.102.0.0/15
--- a/data/country/NZ/NZ-AUK.txt
+++ b/data/country/NZ/NZ-AUK.txt
@@ -1,18 +0,0 @@
 8.39.204.0/24
 43.226.216.0/22
 58.28.0.0/16
 96.7.56.0/23
 103.62.49.0/24
 115.188.80.0/21
 121.99.0.0/16
 125.236.128.0/21
 130.216.0.0/16
 151.101.164.0/22
 151.101.232.0/22
 156.62.0.0/16
 163.47.21.0/24
 163.47.112.0/22
 163.47.128.0/22
 202.169.192.0/19
 202.180.64.0/18
 223.165.64.0/20
--- a/data/country/NZ/NZ-CAN.txt
+++ b/data/country/NZ/NZ-CAN.txt
@@ -1,6 +0,0 @@
 165.84.0.0/17
 165.84.208.0/20
 165.84.224.0/21
 165.84.233.0/24
 165.84.234.0/24
 165.84.236.0/22
--- a/data/country/NZ/NZ-WGN.txt
+++ b/data/country/NZ/NZ-WGN.txt
@@ -1,10 +0,0 @@
 130.195.0.0/16
 156.59.0.0/22
 156.59.5.0/24
 156.59.6.0/23
 156.59.8.0/21
 156.59.16.0/20
 156.59.32.0/19
 156.59.64.0/18
 156.59.128.0/17
 202.53.176.0/20
--- a/data/country/OM/OM-MA.txt
+++ b/data/country/OM/OM-MA.txt
@@ -1,2 +0,0 @@
 62.231.232.0/23
 82.178.96.0/22
--- a/data/country/PH.txt
+++ b/data/country/PH.txt
@@ -162,9 +162,6 @@
 57.93.0.0/20
 58.69.0.0/16
 58.71.0.0/17
 58.82.209.0/24
 58.82.210.0/24
 58.82.242.0/23
 61.9.0.0/17
 61.14.132.64/26
 61.14.132.192/26
--- a/data/country/SG.txt
+++ b/data/country/SG.txt
@@ -1345,24 +1345,6 @@
 57.191.64.0/22
 58.27.14.138/32
 58.65.0.0/19
 58.82.192.0/21
 58.82.200.0/23
 58.82.202.0/24
 58.82.207.0/24
 58.82.208.0/24
 58.82.211.0/24
 58.82.212.0/22
 58.82.216.0/21
 58.82.224.0/23
 58.82.229.0/24
 58.82.230.0/23
 58.82.235.0/24
 58.82.236.0/22
 58.82.240.0/23
 58.82.244.0/22
 58.82.249.0/24
 58.82.250.0/23
 58.82.252.0/22
 58.96.192.0/18
 58.145.192.0/18
 58.146.128.0/18
--- a/data/country/TW.txt
+++ b/data/country/TW.txt
@@ -1161,8 +1161,6 @@
 57.140.255.0/24
 58.27.0.30/32
 58.27.13.78/32
 58.82.205.0/24
 58.82.206.0/24
 58.84.4.0/24
 58.84.242.0/24
 58.86.0.0/20
@@ -8606,7 +8604,9 @@
 203.121.224.0/19
 203.133.0.0/17
 203.135.64.0/19
-203.145.192.0/19
+203.145.192.0/21
 203.145.200.0/21
 203.145.208.0/20
 203.148.92.0/24
 203.160.144.0/20
 203.160.224.0/23
--- a/data/country/TW/TW-CHA.txt
+++ b/data/country/TW/TW-CHA.txt
@@ -328,6 +328,9 @@
 120.109.64.0/20
 125.224.32.0/24
 125.230.82.0/24
 142.250.204.64/26
 142.250.204.128/27
 142.250.207.64/27
 150.116.128.0/19
 175.183.32.0/22
 180.176.112.0/22
@@ -342,6 +345,7 @@
 202.39.134.0/24
 202.39.209.0/24
 202.123.124.0/22
 208.76.69.18/31
 210.60.98.0/23
 210.60.100.0/23
 210.61.214.0/24
--- a/data/country/TW/TW-ILA.txt
+++ b/data/country/TW/TW-ILA.txt
@@ -131,6 +131,7 @@
 202.39.13.0/24
 203.69.220.0/24
 203.72.247.0/24
 203.145.202.0/23
 210.61.50.0/23
 210.242.181.0/24
 211.75.62.0/23
--- a/data/country/TW/TW-TPE.txt
+++ b/data/country/TW/TW-TPE.txt
@@ -2465,9 +2465,7 @@
 103.49.93.0/24
 103.49.126.0/24
 103.49.130.110/31
-103.49.133.0/26
+103.49.133.0/24
 103.49.133.64/26
 103.49.133.128/25
 103.49.134.0/24
 103.51.88.0/23
 103.51.91.0/24
@@ -3309,6 +3307,10 @@
 115.178.0.0/23
 116.206.72.0/22
 116.214.0.0/20
 116.251.83.28/31
 116.251.83.32/31
 116.251.100.74/31
 116.251.101.74/31
 118.99.129.0/24
 118.99.130.0/23
 118.99.160.0/22
@@ -3370,6 +3372,8 @@
 120.127.224.0/20
 120.127.240.0/21
 122.10.98.0/24
 122.112.123.0/24
 122.112.124.0/24
 122.146.0.0/15
 123.58.196.0/23
 123.58.204.0/23
@@ -3443,6 +3447,9 @@
 141.98.209.0/24
 141.98.210.0/23
 141.98.212.0/24
 142.250.196.192/27
 142.250.198.64/27
 142.250.204.32/27
 149.126.224.0/19
 150.116.16.0/20
 150.116.32.0/20
@@ -3460,8 +3467,10 @@
 152.32.229.0/24
 152.32.230.0/23
 152.32.232.0/24
 152.199.104.0/23
 154.16.184.0/21
 154.16.196.0/22
 156.59.33.0/24
 162.158.224.0/22
 162.158.240.0/22
 162.222.164.0/23
@@ -3907,6 +3916,7 @@
 203.211.2.0/24
 203.211.4.0/22
 203.211.8.0/23
 203.215.232.206/31
 210.17.0.0/20
 210.17.16.0/24
 210.17.18.0/24
--- a/data/country/US.txt
+++ b/data/country/US.txt
@@ -10370,6 +10370,7 @@
 30.0.0.0/8
 31.13.65.0/24
 31.13.66.0/24
 31.13.70.0/24
 31.40.214.0/24
 31.170.160.0/22
 31.170.166.0/23
@@ -28544,7 +28545,8 @@
 103.241.212.0/22
 103.246.248.0/24
 104.0.0.0/12
-104.16.0.0/13
+104.16.0.0/14
 104.22.0.0/15
 104.24.0.0/14
 104.28.0.0/21
 104.28.8.0/22
@@ -31536,7 +31538,8 @@
 104.244.32.0/22
 104.244.36.0/23
 104.244.38.0/24
-104.244.40.0/22
+104.244.40.0/23
 104.244.43.0/24
 104.244.45.0/24
 104.244.46.0/23
 104.244.48.0/20
@@ -47281,7 +47284,18 @@
 172.64.64.0/18
 172.64.128.0/17
 172.65.0.0/16
-172.66.0.0/15
+172.66.4.0/22
 172.66.8.0/21
 172.66.16.0/20
 172.66.32.0/21
 172.66.48.0/20
 172.66.64.0/18
 172.66.178.0/23
 172.66.180.0/22
 172.66.184.0/21
 172.66.218.0/23
 172.66.220.0/22
 172.66.224.0/19
 172.68.32.0/21
 172.68.44.0/22
 172.68.52.0/22
--- a/data/country/US/US-CA.txt
+++ b/data/country/US/US-CA.txt
@@ -576,6 +576,7 @@
 24.205.12.0/24
 24.205.128.0/24
 27.34.184.0/24
 31.13.70.0/24
 31.40.214.0/24
 32.224.3.0/25
 34.94.0.0/16