diff --git a/MirrorListV4 b/MirrorListV4 index f361eee..fd63e22 100644 --- a/MirrorListV4 +++ b/MirrorListV4 @@ -1,5 +1,6 @@ 213.129.232.18/32 213.129.232.18/32 +144.208.213.156/32 83.164.133.195/32 89.106.208.14/32 213.129.232.18/32 @@ -27,8 +28,8 @@ 217.79.83.126/32 62.44.96.11/32 87.121.121.4/32 -78.128.80.69/32 78.128.80.70/32 +78.128.80.69/32 207.210.46.249/32 207.210.46.249/32 199.188.220.121/32 @@ -61,16 +62,16 @@ 147.229.176.19/32 89.102.0.150/32 195.113.250.60/32 -194.71.11.173/32 194.71.11.165/32 +194.71.11.173/32 194.71.11.165/32 194.71.11.173/32 130.225.254.116/32 77.247.64.34/32 194.71.11.165/32 194.71.11.173/32 -194.71.11.165/32 194.71.11.173/32 +194.71.11.165/32 195.140.195.56/32 89.190.6.70/32 193.166.3.3/32 @@ -121,8 +122,8 @@ 130.75.2.22/32 131.246.123.4/32 134.93.178.166/32 -129.69.0.41/32 129.69.0.42/32 +129.69.0.41/32 217.243.224.144/32 212.83.32.30/32 5.1.73.59/32 @@ -142,17 +143,13 @@ 78.129.164.123/32 185.165.170.20/32 85.94.199.210/32 -203.178.137.175/32 153.127.75.11/32 +203.178.137.175/32 210.117.237.2/32 85.94.199.210/32 109.73.80.190/32 151.0.128.28/32 -<<<<<<< Updated upstream -90.147.160.72/32 -======= -193.206.214.15/32 ->>>>>>> Stashed changes +193.206.214.14/32 85.94.199.210/32 130.251.19.2/32 140.105.48.55/32 @@ -198,20 +195,14 @@ 195.80.174.186/32 213.129.232.18/32 213.129.232.18/32 -151.101.194.132/32 +151.101.2.132/32 151.101.130.132/32 +151.101.194.132/32 +151.101.66.132/32 151.101.2.132/32 151.101.66.132/32 151.101.130.132/32 -<<<<<<< Updated upstream -151.101.66.132/32 151.101.194.132/32 -151.101.2.132/32 -======= -151.101.2.132/32 -151.101.66.132/32 -151.101.194.132/32 ->>>>>>> Stashed changes 80.64.47.13/32 193.145.15.20/32 95.20.11.14/32 @@ -223,17 +214,10 @@ 193.146.75.19/32 155.210.4.97/32 82.194.78.250/32 -<<<<<<< Updated upstream 194.71.11.165/32 194.71.11.173/32 194.71.11.165/32 194.71.11.173/32 -======= -194.71.11.173/32 -194.71.11.165/32 -194.71.11.165/32 -194.71.11.173/32 ->>>>>>> Stashed changes 130.235.34.30/32 194.71.11.165/32 194.71.11.173/32 @@ -245,25 +229,14 @@ 129.132.89.152/32 129.132.89.152/32 95.143.57.162/32 -<<<<<<< Updated upstream -188.185.48.60/32 -137.138.121.171/32 137.138.54.24/32 -188.185.41.214/32 188.185.40.58/32 188.184.65.236/32 188.184.79.9/32 -137.138.55.108/32 -======= -188.185.41.214/32 -137.138.54.24/32 -137.138.55.108/32 188.185.48.60/32 +188.185.41.214/32 137.138.121.171/32 -188.185.40.58/32 -188.184.79.9/32 -188.184.65.236/32 ->>>>>>> Stashed changes +137.138.55.108/32 83.166.143.42/32 83.166.143.43/32 109.202.202.202/32 @@ -280,10 +253,6 @@ 94.229.65.150/32 213.230.211.73/32 46.235.229.21/32 -<<<<<<< Updated upstream -======= -163.1.221.67/32 ->>>>>>> Stashed changes 163.1.160.163/32 163.1.221.67/32 80.87.134.17/32 @@ -293,24 +262,19 @@ 81.91.100.175/32 81.91.100.176/32 5.180.211.190/32 +64.50.236.52/32 208.80.154.139/32 64.50.233.100/32 -64.50.236.52/32 -<<<<<<< Updated upstream 64.50.233.100/32 -======= ->>>>>>> Stashed changes 208.80.154.139/32 64.50.236.52/32 -64.50.233.100/32 -208.80.154.139/32 92.119.16.152/32 20.61.228.89/32 128.180.2.105/32 128.30.3.141/32 108.61.5.92/32 -140.211.166.134/32 64.50.236.52/32 +140.211.166.134/32 128.135.10.29/32 207.45.83.102/32 77.247.126.176/32 @@ -357,40 +321,21 @@ 176.124.104.176/32 185.100.87.86/32 164.73.233.2/32 -<<<<<<< Updated upstream -151.101.2.132/32 +151.101.130.132/32 151.101.66.132/32 151.101.194.132/32 -151.101.130.132/32 -3.164.240.105/32 -3.164.240.123/32 -3.164.240.73/32 -3.164.240.119/32 +151.101.2.132/32 +13.227.219.58/32 +13.227.219.37/32 +13.227.219.87/32 +13.227.219.51/32 +212.224.123.70/32 45.84.67.184/32 -185.219.221.167/32 -185.199.110.153/32 185.199.111.153/32 +185.199.110.153/32 185.199.108.153/32 185.199.109.153/32 185.199.108.153/32 -======= -151.101.194.132/32 -151.101.130.132/32 -151.101.66.132/32 -151.101.2.132/32 -3.164.240.73/32 -3.164.240.105/32 -3.164.240.119/32 -3.164.240.123/32 -185.219.221.167/32 -185.219.221.167/32 +185.199.111.153/32 185.199.110.153/32 185.199.109.153/32 -185.199.111.153/32 -185.199.108.153/32 -185.199.108.153/32 -185.199.111.153/32 ->>>>>>> Stashed changes -185.199.109.153/32 -185.199.110.153/32 -185.199.111.153/32 diff --git a/MirrorListV6 b/MirrorListV6 index 59a3c0b..7836a1a 100644 --- a/MirrorListV6 +++ b/MirrorListV6 @@ -49,22 +49,16 @@ 2001:67c:1220:8b0::93e5:b013/128 2a02:8301:0:2::150/128 2001:718:1007:48::1:60/128 -2001:6b0:19::165/128 2001:6b0:19::173/128 2001:6b0:19::165/128 2001:6b0:19::173/128 +2001:6b0:19::165/128 2001:878:346::116/128 2a02:4de0:21::2/128 2001:6b0:19::165/128 -<<<<<<< Updated upstream 2001:6b0:19::173/128 2001:6b0:19::173/128 2001:6b0:19::165/128 -======= -2001:6b0:19::173/128 -2001:6b0:19::165/128 -2001:6b0:19::173/128 ->>>>>>> Stashed changes 2001:67c:2b0:19:201:aeff:fe64:6562/128 2001:67c:ecc:25::70/128 2001:708:10:8::3/128 @@ -105,8 +99,8 @@ 2001:638:911:b0e:134:109:228:1/128 2001:638:208:ef1b:0:ff:fe00:4/128 2001:4c80:40:628:215:5dff:fe01:be02/128 -2001:7c0:2041:48::42/128 2001:7c0:2041:48::41/128 +2001:7c0:2041:48::42/128 2003:d1:3012::400/128 2a00:f48:1007:32::30/128 2a07:6fc0:1:0:73::59/128 @@ -128,11 +122,7 @@ 2001:320:237::2/128 2001:4b78:2000:1::1/128 2a00:1cc8:0:ff0a::2/128 -<<<<<<< Updated upstream -2001:760:ffff:b6:4:100:0:73/128 -======= -2001:760:ffff:bf::ab/128 ->>>>>>> Stashed changes +2001:760:ffff:b6:4:100:0:72/128 2001:4b78:2000:1::1/128 2001:760:2e03::ca:26:0/128 2001:67c:2564:a120::21/128 @@ -170,46 +160,26 @@ 2a02:130:9900:30::12/128 2001:858:2:1::10/128 2001:858:2:1::10/128 -<<<<<<< Updated upstream 2a04:4e42:600::644/128 -2a04:4e42:200::644/128 -2a04:4e42:400::644/128 2a04:4e42::644/128 2a04:4e42:400::644/128 -2a04:4e42:600::644/128 -2a04:4e42:200::644/128 -2a04:4e42::644/128 -======= -2a04:4e42:400::644/128 -2a04:4e42::644/128 -2a04:4e42:600::644/128 -2a04:4e42:200::644/128 2a04:4e42:200::644/128 2a04:4e42::644/128 2a04:4e42:400::644/128 +2a04:4e42:200::644/128 2a04:4e42:600::644/128 ->>>>>>> Stashed changes 2001:720:424:1::1:20/128 2001:470:c8b6:0:10:1:2:4/128 2001:720:1214:4200::81/128 2a00:9ac0:c1ca:5::134/128 2a12:d282:102:f6::1/128 2001:720:1c14::ffff:c192:4b13/128 -<<<<<<< Updated upstream 2001:6b0:19::173/128 2001:6b0:19::165/128 2001:6b0:19::173/128 2001:6b0:19::165/128 2001:6b0:19::165/128 2001:6b0:19::173/128 -======= -2001:6b0:19::173/128 -2001:6b0:19::165/128 -2001:6b0:19::173/128 -2001:6b0:19::165/128 -2001:6b0:19::173/128 -2001:6b0:19::165/128 ->>>>>>> Stashed changes 2a01:8e01:c1ea:6c5c::5/128 2a01:8e01:c1ea:6c5c::8/128 2a02:750:9::e8/128 @@ -217,25 +187,14 @@ 2001:e10:2000:240:e643:4bff:fee8:a63c/128 2001:67c:10ec:3dc2::28/128 2001:67c:10ec:3dc2::28/128 -<<<<<<< Updated upstream +2001:1458:d00:16::100:427/128 +2001:1458:d00:6f::100:42e/128 +2001:1458:201:a4::100:2dc/128 2001:1458:d00:61::100:3d6/128 2001:1458:d00:17::100:24e/128 -2001:1458:201:a4::100:2dc/128 -2001:1458:d00:6f::100:42e/128 2001:1458:d00:17::100:c5/128 -2001:1458:d00:16::100:427/128 2001:1458:d00:24::100:635/128 2001:1458:d00:24::100:356/128 -======= -2001:1458:201:a4::100:2dc/128 -2001:1458:d00:17::100:24e/128 -2001:1458:d00:61::100:3d6/128 -2001:1458:d00:24::100:635/128 -2001:1458:d00:24::100:356/128 -2001:1458:d00:6f::100:42e/128 -2001:1458:d00:17::100:c5/128 -2001:1458:d00:16::100:427/128 ->>>>>>> Stashed changes 2001:1600:0:aaaa::2:2/128 2001:1600:0:aaaa::2:1/128 2001:1620::1620/128 @@ -254,18 +213,11 @@ 2a0f:85c1:c3b:2010::35/128 2a0d:5082:0:7::2/128 2600:3402:200:227::2/128 -2620:0:861:2:208:80:154:139/128 -<<<<<<< Updated upstream 2600:3404:200:237::2/128 +2620:0:861:2:208:80:154:139/128 2600:3402:200:227::2/128 +2600:3404:200:237::2/128 2620:0:861:2:208:80:154:139/128 -2600:3404:200:237::2/128 -======= -2600:3404:200:237::2/128 -2600:3404:200:237::2/128 -2600:3402:200:227::2/128 -2620:0:861:2:208:80:154:139/128 ->>>>>>> Stashed changes 2a10:4dc0:2:5::2/128 2603:1020:203:3::a/128 2001:19f0:1595:1403::1092/128 @@ -299,47 +251,25 @@ 2001:67c:744:7::2/128 2a06:1700:0:38::1/128 2001:1328:54:fff::2/128 -2a04:4e42:200::644/128 -<<<<<<< Updated upstream 2a04:4e42:600::644/128 -2a04:4e42:400::644/128 -2600:9000:21c7:ec00:3:db06:4200:93a1/128 -2600:9000:21c7:8000:3:db06:4200:93a1/128 -2600:9000:21c7:d600:3:db06:4200:93a1/128 -2600:9000:21c7:da00:3:db06:4200:93a1/128 -2600:9000:21c7:aa00:3:db06:4200:93a1/128 -2600:9000:21c7:cc00:3:db06:4200:93a1/128 -2600:9000:21c7:d000:3:db06:4200:93a1/128 -2600:9000:21c7:2600:3:db06:4200:93a1/128 -2001:41d0:b00:5900::34/128 -2a0b:7140:5:100::167/128 -2606:50c0:8000::153/128 -2606:50c0:8003::153/128 -2606:50c0:8001::153/128 -2606:50c0:8002::153/128 -2606:50c0:8003::153/128 -2606:50c0:8002::153/128 -2606:50c0:8001::153/128 -======= 2a04:4e42::644/128 +2a04:4e42:200::644/128 2a04:4e42:400::644/128 -2a04:4e42:600::644/128 -2600:9000:2764:8400:3:db06:4200:93a1/128 -2600:9000:2764:1200:3:db06:4200:93a1/128 -2600:9000:2764:ee00:3:db06:4200:93a1/128 -2600:9000:2764:5c00:3:db06:4200:93a1/128 -2600:9000:2764:6e00:3:db06:4200:93a1/128 -2600:9000:2764:7000:3:db06:4200:93a1/128 -2600:9000:2764:8a00:3:db06:4200:93a1/128 -2600:9000:2764:2c00:3:db06:4200:93a1/128 -2a0b:7140:5:100::167/128 +2600:9000:21c7:2a00:3:db06:4200:93a1/128 +2600:9000:21c7:1e00:3:db06:4200:93a1/128 +2600:9000:21c7:6600:3:db06:4200:93a1/128 +2600:9000:21c7:e000:3:db06:4200:93a1/128 +2600:9000:21c7:e400:3:db06:4200:93a1/128 +2600:9000:21c7:a800:3:db06:4200:93a1/128 +2600:9000:21c7:6200:3:db06:4200:93a1/128 +2600:9000:21c7:d000:3:db06:4200:93a1/128 +2a01:7e0:0:424::249/128 2a0e:9880:304::184/128 +2606:50c0:8002::153/128 2606:50c0:8000::153/128 2606:50c0:8001::153/128 2606:50c0:8003::153/128 -2606:50c0:8002::153/128 2606:50c0:8001::153/128 +2606:50c0:8000::153/128 2606:50c0:8002::153/128 2606:50c0:8003::153/128 ->>>>>>> Stashed changes -2606:50c0:8000::153/128 diff --git a/OPNS_MirrorListV4 b/OPNS_MirrorListV4 index 8532418..e826e1f 100644 --- a/OPNS_MirrorListV4 +++ b/OPNS_MirrorListV4 @@ -4,18 +4,14 @@ 178.157.61.30/32 216.24.182.173/32 162.105.120.100/32 -188.114.97.1/32 188.114.96.1/32 +188.114.97.1/32 130.225.254.116/32 46.32.144.253/32 201.159.221.67/32 201.159.221.67/32 62.210.129.125/32 31.38.161.123/32 -<<<<<<< Updated upstream -172.67.206.93/32 -======= ->>>>>>> Stashed changes 104.21.22.179/32 172.67.206.93/32 141.98.136.67/32 @@ -25,34 +21,20 @@ 145.236.174.149/32 180.151.236.94/32 78.39.136.13/32 -<<<<<<< Updated upstream -104.18.3.112/32 -104.18.2.112/32 -104.18.6.32/32 -104.18.7.32/32 -104.18.7.32/32 -104.18.6.32/32 -======= 104.18.2.112/32 104.18.3.112/32 -104.18.7.32/32 -104.18.6.32/32 104.18.6.32/32 104.18.7.32/32 ->>>>>>> Stashed changes +104.18.7.32/32 +104.18.6.32/32 221.138.103.74/32 0.0.0.0/32 14.79.156.154/32 182.216.209.74/32 104.18.7.32/32 104.18.6.32/32 -<<<<<<< Updated upstream -104.18.7.32/32 -104.18.6.32/32 -======= 104.18.6.32/32 104.18.7.32/32 ->>>>>>> Stashed changes 196.200.160.70/32 150.242.40.7/32 23.147.168.189/32 diff --git a/OPNS_MirrorListV6 b/OPNS_MirrorListV6 index 05c2a57..40d7374 100644 --- a/OPNS_MirrorListV6 +++ b/OPNS_MirrorListV6 @@ -17,26 +17,15 @@ 2606:4700::6812:370/128 2606:4700::6812:720/128 2606:4700::6812:620/128 -<<<<<<< Updated upstream -2606:4700::6812:620/128 -2606:4700::6812:720/128 -::/128 2606:4700::6812:720/128 2606:4700::6812:620/128 2606:4700::6812:720/128 2606:4700::6812:620/128 -======= 2606:4700::6812:720/128 2606:4700::6812:620/128 -::/128 -2606:4700::6812:720/128 -2606:4700::6812:620/128 -2606:4700::6812:620/128 -2606:4700::6812:720/128 ->>>>>>> Stashed changes 2001:4310:f1::70/128 -2602:faa5:189::/128 2602:faa5:190::/128 +2602:faa5:189::/128 2a12:d282:102:f6::1/128 2a03:1b21:100:4::1/128 2a00:d08:1:c::153/128