定期更新数据并生成 gfw.pac

.github/workflows/auto-generate-pac.yml

@@ -11,7 +11,6 @@ on:
       - 'direct-domains.txt'
       - 'proxy-domains.txt'
       - 'cidrs-cn.txt'
-      - '!gfw.pac'
   workflow_dispatch:
 
 jobs:
@@ -21,13 +20,25 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Check if gfw.pac is in the commit
+        id: check-file
+        run: |
+          if git diff --name-only HEAD^ HEAD | grep -q 'gfw\.pac'; then
+            echo "file-exists=true" >> $GITHUB_ENV
+          else
+            echo "file-exists=false" >> $GITHUB_ENV
+          fi
+
       - name: Download the latest cn.txt
+        if: env.file-exists == 'false'
         run: curl -L https://raw.githubusercontent.com/Loyalsoldier/geoip/release/text/cn.txt -o cidrs-cn.txt
 
       - name: Run gfw-pac.py script
+        if: env.file-exists == 'false'
         run: ./gfw-pac.py -f gfw.pac -p "PROXY 127.0.0.1:3128" --proxy-domains=proxy-domains.txt --direct-domains=direct-domains.txt --localtld-domains=local-tlds.txt --ip-file=cidrs-cn.txt
 
       - name: Commit and push changes
+        if: env.file-exists == 'false'
         run: |
           last_commit_message=$(git log -1 --pretty=%B)
           commit_message=$([[ "${{ github.event_name }}" == "schedule" ]] && echo "定期更新数据并生成 gfw.pac" || echo "自动生成 gfw.pac: $last_commit_message")
@@ -38,6 +49,7 @@ jobs:
           git push
 
       - name: Trigger Auto-Release
+        if: env.file-exists == 'false'
         uses: benc-uk/workflow-dispatch@v1
         with:
           workflow: Auto Generate Release

cidrs-cn.txt

@@ -1078,8 +1078,7 @@
 47.246.50.0/24
 47.246.57.0/24
 47.246.58.0/24
-47.246.60.0/23
+47.246.60.0/22
-47.246.62.0/24
 49.4.0.0/17
 49.4.128.0/22
 49.4.160.0/19
@@ -1251,7 +1250,6 @@
 81.173.18.0/23
 81.173.20.0/22
 81.173.28.0/24
-82.153.50.0/24
 82.156.0.0/15
 85.237.205.0/24
 87.254.207.0/24
@@ -1652,7 +1650,6 @@
 103.43.104.0/22
 103.43.124.0/22
 103.43.132.0/22
-103.43.175.0/24
 103.43.184.0/22
 103.43.192.0/21
 103.43.208.0/22
@@ -2476,7 +2473,6 @@
 103.150.212.0/24
 103.150.216.0/23
 103.150.244.0/23
-103.151.4.0/24
 103.151.142.0/23
 103.151.148.0/23
 103.151.158.0/23
@@ -2631,7 +2627,6 @@
 103.177.28.0/23
 103.177.70.0/23
 103.177.162.0/24
-103.178.56.0/24
 103.178.240.0/23
 103.179.76.0/22
 103.180.108.0/23
@@ -3111,7 +3106,6 @@
 103.244.232.0/22
 103.244.252.0/22
 103.245.23.0/24
-103.245.24.0/23
 103.245.52.0/22
 103.245.60.0/22
 103.245.80.0/22
@@ -4590,6 +4584,7 @@
 134.75.107.10/31
 134.75.107.14/31
 134.175.0.0/16
+136.0.248.0/24
 137.59.59.0/24
 137.59.88.0/22
 138.32.244.0/24
@@ -4781,25 +4776,25 @@
 154.209.251.0/24
 154.213.4.0/23
 154.218.6.0/23
-154.223.168.0/23
+154.223.168.0/24
-154.223.170.0/24
+154.223.178.0/24
-154.223.178.0/23
-154.223.180.0/24
-154.223.182.0/24
 154.223.188.0/23
 155.102.0.0/23
 155.102.2.0/24
 155.102.4.0/23
 155.102.9.0/24
-155.102.13.0/24
+155.102.12.0/23
 155.102.16.0/23
 155.102.22.0/23
 155.102.24.0/24
 155.102.30.0/24
+155.102.33.0/24
+155.102.34.0/24
 155.102.36.0/23
 155.102.38.0/24
 155.102.40.0/23
 155.102.42.0/24
+155.102.44.0/24
 155.102.51.0/24
 155.102.54.0/24
 155.102.59.0/24
@@ -4943,7 +4938,7 @@
 163.181.28.0/24
 163.181.32.0/21
 163.181.40.0/24
-163.181.42.0/24
+163.181.42.0/23
 163.181.44.0/24
 163.181.49.0/24
 163.181.50.0/24
@@ -4980,9 +4975,7 @@
 163.181.132.0/23
 163.181.135.0/24
 163.181.136.0/21
-163.181.144.0/22
+163.181.144.0/21
-163.181.148.0/23
-163.181.151.0/24
 163.181.153.0/24
 163.181.154.0/23
 163.181.156.0/22
@@ -4999,8 +4992,7 @@
 163.181.201.0/24
 163.181.202.0/23
 163.181.204.0/22
-163.181.208.0/22
+163.181.208.0/21
-163.181.212.0/23
 163.181.216.0/22
 163.181.220.0/23
 163.181.224.0/23
@@ -5211,6 +5203,9 @@
 193.17.120.0/22
 193.20.64.0/22
 193.112.0.0/16
+193.119.10.0/24
+193.119.20.0/24
+193.119.30.0/24
 193.200.222.160/28
 194.15.39.0/24
 194.61.237.0/25
@@ -6643,7 +6638,6 @@
 203.174.4.0/24
 203.174.6.0/23
 203.174.96.0/19
-203.175.12.0/24
 203.175.14.0/23
 203.175.128.0/19
 203.175.192.0/18
@@ -7182,9 +7176,11 @@
 2001:470:8:52c::/64
 2001:470:8:547::/64
 2001:470:8:550::/64
+2001:470:8:564::/64
 2001:470:8:56a::/64
 2001:470:8:574::/63
 2001:470:8:577::/64
+2001:470:8:579::/64
 2001:470:8:71d::/64
 2001:470:8:7d7::/64
 2001:470:8:7e6::/64
@@ -7265,7 +7261,6 @@
 2001:470:b:223::/64
 2001:470:b:228::/64
 2001:470:b:22e::/63
-2001:470:b:233::/64
 2001:470:b:25b::/64
 2001:470:b:25c::/64
 2001:470:b:25e::/64
@@ -7360,13 +7355,13 @@
 2001:470:b:4db::/64
 2001:470:b:4dc::/63
 2001:470:b:4e1::/64
+2001:470:b:4e4::/64
 2001:470:b:4e6::/64
 2001:470:b:4eb::/64
 2001:470:b:4f0::/63
 2001:470:b:4fe::/64
 2001:470:b:509::/64
 2001:470:b:511::/64
-2001:470:b:514::/64
 2001:470:b:517::/64
 2001:470:b:521::/64
 2001:470:b:527::/64
@@ -7379,6 +7374,8 @@
 2001:470:b:579::/64
 2001:470:b:57b::/64
 2001:470:b:57d::/64
+2001:470:b:592::/64
+2001:470:b:594::/63
 2001:470:b:633::/64
 2001:470:b:63a::/64
 2001:470:b:6b8::/64
@@ -7416,6 +7413,7 @@
 2001:470:d:46::/63
 2001:470:d:48::/63
 2001:470:d:4b::/64
+2001:470:d:53::/64
 2001:470:d:54::/63
 2001:470:d:57::/64
 2001:470:d:59::/64
@@ -7491,7 +7489,6 @@
 2001:470:d:128::/63
 2001:470:d:12a::/64
 2001:470:d:12c::/63
-2001:470:d:135::/64
 2001:470:d:136::/63
 2001:470:d:139::/64
 2001:470:d:13d::/64
@@ -7509,7 +7506,7 @@
 2001:470:d:161::/64
 2001:470:d:165::/64
 2001:470:d:16d::/64
-2001:470:d:16e::/63
+2001:470:d:16f::/64
 2001:470:d:176::/64
 2001:470:d:17a::/64
 2001:470:d:17c::/64
@@ -7855,7 +7852,6 @@
 2001:470:d:5da::/64
 2001:470:d:5de::/64
 2001:470:d:5e2::/64
-2001:470:d:5e4::/64
 2001:470:d:5e6::/63
 2001:470:d:5e9::/64
 2001:470:d:5ef::/64
@@ -7916,20 +7912,28 @@
 2001:470:d:691::/64
 2001:470:d:693::/64
 2001:470:d:695::/64
-2001:470:d:69c::/64
+2001:470:d:69a::/63
+2001:470:d:69c::/63
 2001:470:d:69e::/64
 2001:470:d:6a3::/64
 2001:470:d:6a5::/64
+2001:470:d:6a8::/64
 2001:470:d:6ab::/64
 2001:470:d:6ad::/64
 2001:470:d:6ae::/64
+2001:470:d:6b3::/64
+2001:470:d:6b7::/64
+2001:470:d:6b8::/64
 2001:470:d:6bd::/64
 2001:470:d:6be::/63
-2001:470:d:6c2::/64
+2001:470:d:6c2::/63
 2001:470:d:6c4::/64
+2001:470:d:6c7::/64
 2001:470:d:6c8::/64
-2001:470:d:6ce::/64
+2001:470:d:6cb::/64
+2001:470:d:6ce::/63
 2001:470:d:6d0::/64
+2001:470:d:6d2::/64
 2001:470:d:6d4::/64
 2001:470:d:6d9::/64
 2001:470:d:6df::/64
@@ -8154,12 +8158,10 @@
 2001:470:d:ac2::/64
 2001:470:d:ac6::/64
 2001:470:d:ac8::/63
-2001:470:d:aca::/64
 2001:470:d:acc::/64
 2001:470:d:ad0::/63
 2001:470:d:ad3::/64
 2001:470:d:ad5::/64
-2001:470:d:ad6::/64
 2001:470:d:adc::/64
 2001:470:d:ae2::/64
 2001:470:d:ae6::/64
@@ -8722,7 +8724,8 @@
 2001:470:d:1ca4::/64
 2001:470:d:1d43::/64
 2001:470:19:1::/64
-2001:470:19:4::/62
+2001:470:19:4::/63
+2001:470:19:7::/64
 2001:470:19:8::/64
 2001:470:19:a::/63
 2001:470:19:d::/64
@@ -9433,7 +9436,6 @@
 2001:470:19:772::/63
 2001:470:19:775::/64
 2001:470:19:777::/64
-2001:470:19:778::/64
 2001:470:19:77a::/63
 2001:470:19:77d::/64
 2001:470:19:77f::/64
@@ -10071,8 +10073,7 @@
 2001:470:19:e20::/63
 2001:470:19:e22::/64
 2001:470:19:e27::/64
-2001:470:19:e28::/63
+2001:470:19:e28::/62
-2001:470:19:e2a::/64
 2001:470:19:e2e::/64
 2001:470:19:e35::/64
 2001:470:19:e3a::/64
@@ -10096,7 +10097,6 @@
 2001:470:19:e6e::/63
 2001:470:19:e70::/64
 2001:470:19:e73::/64
-2001:470:19:e75::/64
 2001:470:19:e76::/64
 2001:470:19:e7a::/64
 2001:470:19:e7c::/63
@@ -10196,6 +10196,14 @@
 2001:470:19:f9c::/63
 2001:470:19:f9f::/64
 2001:470:19:fa0::/64
+2001:470:19:fa8::/64
+2001:470:19:fac::/64
+2001:470:19:fae::/64
+2001:470:19:fb2::/64
+2001:470:19:fb4::/64
+2001:470:19:fb6::/64
+2001:470:19:fbb::/64
+2001:470:19:fc2::/64
 2001:470:19:fd9::/64
 2001:470:19:fe7::/64
 2001:470:19:fe8::/64
@@ -10352,6 +10360,7 @@
 2001:470:1d:165::/64
 2001:470:1d:167::/64
 2001:470:1d:18b::/64
+2001:470:1d:18d::/64
 2001:470:1d:19d::/64
 2001:470:1d:1b3::/64
 2001:470:1d:1b5::/64
@@ -10656,7 +10665,7 @@
 2001:470:24:42c::/63
 2001:470:24:42e::/64
 2001:470:24:430::/64
-2001:470:24:433::/64
+2001:470:24:432::/63
 2001:470:24:435::/64
 2001:470:24:436::/64
 2001:470:24:439::/64
@@ -10727,7 +10736,6 @@
 2001:470:24:524::/64
 2001:470:24:526::/64
 2001:470:24:528::/64
-2001:470:24:52b::/64
 2001:470:24:52f::/64
 2001:470:24:531::/64
 2001:470:24:532::/64
@@ -10744,6 +10752,8 @@
 2001:470:24:55d::/64
 2001:470:24:562::/64
 2001:470:24:565::/64
+2001:470:24:566::/64
+2001:470:24:56a::/64
 2001:470:24:571::/64
 2001:470:24:572::/64
 2001:470:24:574::/64
@@ -10795,7 +10805,6 @@
 2001:470:24:631::/64
 2001:470:24:632::/64
 2001:470:24:634::/64
-2001:470:24:636::/64
 2001:470:24:63a::/63
 2001:470:24:63c::/64
 2001:470:24:646::/64
@@ -10806,7 +10815,6 @@
 2001:470:24:66c::/63
 2001:470:24:675::/64
 2001:470:24:676::/64
-2001:470:24:678::/64
 2001:470:24:67e::/64
 2001:470:24:681::/64
 2001:470:24:686::/64
@@ -10921,6 +10929,7 @@
 2001:470:28:c77::/64
 2001:470:28:d94::/64
 2001:470:28:e1b::/64
+2001:470:28:f04::/64
 2001:470:36:2::/64
 2001:470:36:a::/64
 2001:470:36:15::/64
@@ -10983,7 +10992,6 @@
 2001:470:36:19f::/64
 2001:470:36:1a7::/64
 2001:470:36:1ab::/64
-2001:470:36:1ad::/64
 2001:470:36:1b1::/64
 2001:470:36:1b5::/64
 2001:470:36:1bd::/64
@@ -11178,7 +11186,7 @@
 2001:470:36:674::/64
 2001:470:36:676::/64
 2001:470:36:682::/64
-2001:470:36:684::/63
+2001:470:36:685::/64
 2001:470:36:689::/64
 2001:470:36:692::/63
 2001:470:36:699::/64
@@ -11190,13 +11198,17 @@
 2001:470:36:6b7::/64
 2001:470:36:6bd::/64
 2001:470:36:6c0::/64
+2001:470:36:6d1::/64
 2001:470:36:6d8::/64
+2001:470:36:6dd::/64
 2001:470:36:6e8::/63
 2001:470:36:6ef::/64
+2001:470:36:6f0::/64
 2001:470:36:6f3::/64
 2001:470:36:6f4::/64
 2001:470:36:6f7::/64
 2001:470:36:6fb::/64
+2001:470:36:702::/64
 2001:470:36:70b::/64
 2001:470:36:70c::/64
 2001:470:36:70e::/64
@@ -11476,8 +11488,7 @@
 2001:470:67:12a::/64
 2001:470:67:131::/64
 2001:470:67:133::/64
-2001:470:67:138::/63
+2001:470:67:138::/62
-2001:470:67:13b::/64
 2001:470:67:13f::/64
 2001:470:67:140::/63
 2001:470:67:142::/64
@@ -11528,7 +11539,7 @@
 2001:470:67:20e::/64
 2001:470:67:213::/64
 2001:470:67:217::/64
-2001:470:67:218::/64
+2001:470:67:218::/63
 2001:470:67:21a::/64
 2001:470:67:21d::/64
 2001:470:67:21e::/64
@@ -11620,17 +11631,19 @@
 2001:470:67:341::/64
 2001:470:67:343::/64
 2001:470:67:34c::/64
+2001:470:67:34f::/64
 2001:470:67:358::/64
 2001:470:67:35a::/63
 2001:470:67:360::/63
 2001:470:67:363::/64
 2001:470:67:365::/64
 2001:470:67:369::/64
-2001:470:67:36b::/64
 2001:470:67:36c::/63
+2001:470:67:375::/64
 2001:470:67:379::/64
 2001:470:67:37c::/64
 2001:470:67:386::/64
+2001:470:67:38c::/64
 2001:470:67:39a::/64
 2001:470:67:3a7::/64
 2001:470:67:3ab::/64
@@ -11783,6 +11796,7 @@
 2001:470:71:fa::/64
 2001:470:71:106::/64
 2001:470:71:1e5::/64
+2001:470:71:248::/64
 2001:470:71:280::/64
 2001:470:71:351::/64
 2001:470:71:3af::/64
@@ -11793,6 +11807,7 @@
 2001:470:71:678::/64
 2001:470:71:713::/64
 2001:470:71:754::/64
+2001:470:71:8b7::/64
 2001:470:7c:1b::/64
 2001:470:7c:36::/64
 2001:470:7c:43::/64
@@ -11863,12 +11878,12 @@
 2001:470:7c:267::/64
 2001:470:7c:26a::/64
 2001:470:7c:28f::/64
-2001:470:7c:2b6::/64
 2001:470:7c:2bd::/64
 2001:470:7c:2cf::/64
 2001:470:7c:2d3::/64
 2001:470:7c:2d7::/64
 2001:470:7c:2e5::/64
+2001:470:7c:307::/64
 2001:470:7c:35d::/64
 2001:470:7c:38d::/64
 2001:470:7c:3ee::/64
@@ -11879,6 +11894,8 @@
 2001:470:18a5::/48
 2001:470:18c2::/48
 2001:470:18e5::/48
+2001:470:18f0::/48
+2001:470:18f9::/48
 2001:470:1945::/48
 2001:470:199a::/48
 2001:470:1ade::/48
@@ -11933,6 +11950,7 @@
 2001:470:1f05:b5::/64
 2001:470:1f05:b6::/64
 2001:470:1f05:b8::/63
+2001:470:1f05:ba::/64
 2001:470:1f05:c0::/64
 2001:470:1f05:c2::/64
 2001:470:1f05:c5::/64
@@ -11957,7 +11975,7 @@
 2001:470:1f05:10c::/64
 2001:470:1f05:10f::/64
 2001:470:1f05:114::/64
-2001:470:1f05:118::/64
+2001:470:1f05:118::/63
 2001:470:1f05:11b::/64
 2001:470:1f05:11c::/64
 2001:470:1f05:120::/62
@@ -11984,13 +12002,16 @@
 2001:470:1f05:16d::/64
 2001:470:1f05:16f::/64
 2001:470:1f05:17d::/64
-2001:470:1f05:17e::/64
+2001:470:1f05:17e::/63
 2001:470:1f05:181::/64
 2001:470:1f05:183::/64
 2001:470:1f05:184::/63
 2001:470:1f05:186::/64
 2001:470:1f05:188::/63
 2001:470:1f05:192::/63
+2001:470:1f05:196::/64
+2001:470:1f05:199::/64
+2001:470:1f05:19c::/63
 2001:470:1f05:1a6::/64
 2001:470:1f05:1b1::/64
 2001:470:1f05:1b5::/64
@@ -12094,7 +12115,6 @@
 2001:470:1f05:3fd::/64
 2001:470:1f05:3fe::/63
 2001:470:1f05:403::/64
-2001:470:1f05:405::/64
 2001:470:1f05:407::/64
 2001:470:1f05:40a::/64
 2001:470:1f05:40d::/64
@@ -12385,6 +12405,7 @@
 2001:470:1f07:1dc::/64
 2001:470:1f07:1e4::/64
 2001:470:1f07:1f0::/64
+2001:470:1f07:1fb::/64
 2001:470:1f07:1fe::/64
 2001:470:1f07:206::/64
 2001:470:1f07:20d::/64
@@ -12402,6 +12423,7 @@
 2001:470:1f07:278::/64
 2001:470:1f07:28c::/64
 2001:470:1f07:290::/64
+2001:470:1f07:294::/64
 2001:470:1f07:2a3::/64
 2001:470:1f07:2a4::/64
 2001:470:1f07:2a8::/64
@@ -12423,7 +12445,6 @@
 2001:470:1f07:341::/64
 2001:470:1f07:344::/64
 2001:470:1f07:350::/64
-2001:470:1f07:358::/64
 2001:470:1f07:35d::/64
 2001:470:1f07:365::/64
 2001:470:1f07:367::/64
@@ -12478,7 +12499,8 @@
 2001:470:1f07:62c::/64
 2001:470:1f07:630::/64
 2001:470:1f07:645::/64
-2001:470:1f07:654::/64
+2001:470:1f07:64c::/64
+2001:470:1f07:654::/63
 2001:470:1f07:66e::/64
 2001:470:1f07:680::/64
 2001:470:1f07:687::/64
@@ -12574,7 +12596,6 @@
 2001:470:1f09:1d4::/64
 2001:470:1f09:208::/64
 2001:470:1f09:21c::/64
-2001:470:1f09:221::/64
 2001:470:1f09:29a::/64
 2001:470:1f09:2dc::/64
 2001:470:1f09:2de::/64
@@ -12641,6 +12662,7 @@
 2001:470:1f0b:b4f::/64
 2001:470:1f0b:b75::/64
 2001:470:1f0b:c6b::/64
+2001:470:1f0b:c8e::/64
 2001:470:1f0b:cb5::/64
 2001:470:1f0b:cd0::/64
 2001:470:1f0b:cf1::/64
@@ -12657,6 +12679,8 @@
 2001:470:1f0b:10f7::/64
 2001:470:1f0b:111a::/64
 2001:470:1f0b:111d::/64
+2001:470:1f0b:115e::/64
+2001:470:1f0b:1176::/64
 2001:470:1f0b:120b::/64
 2001:470:1f0b:12fd::/64
 2001:470:1f0f:3::/64
@@ -12727,12 +12751,14 @@
 2001:470:1f0f:302::/64
 2001:470:1f0f:305::/64
 2001:470:1f0f:30a::/63
-2001:470:1f0f:30e::/64
 2001:470:1f0f:313::/64
 2001:470:1f0f:31e::/64
 2001:470:1f0f:322::/64
 2001:470:1f0f:342::/64
 2001:470:1f0f:34e::/64
+2001:470:1f0f:358::/64
+2001:470:1f0f:35b::/64
+2001:470:1f0f:366::/64
 2001:470:1f0f:36a::/64
 2001:470:1f0f:373::/64
 2001:470:1f0f:3ff::/64
@@ -12879,8 +12905,8 @@
 2001:470:1f11:4a2::/64
 2001:470:1f11:4ac::/64
 2001:470:1f11:4b1::/64
-2001:470:1f11:4b3::/64
 2001:470:1f11:4b8::/64
+2001:470:1f11:4c8::/64
 2001:470:1f11:598::/64
 2001:470:1f11:62f::/64
 2001:470:1f11:716::/64
@@ -12982,7 +13008,6 @@
 2001:470:1f17:9d::/64
 2001:470:1f17:ba::/64
 2001:470:1f17:be::/64
-2001:470:1f17:c1::/64
 2001:470:1f17:c4::/64
 2001:470:1f17:e3::/64
 2001:470:1f17:e6::/64
@@ -13178,6 +13203,7 @@
 2001:470:1f1d:9c::/64
 2001:470:1f1d:f2::/64
 2001:470:1f1d:116::/64
+2001:470:1f1d:137::/64
 2001:470:1f1d:142::/64
 2001:470:1f1d:188::/64
 2001:470:1f1d:1a1::/64
@@ -13187,7 +13213,9 @@
 2001:470:1f1d:1ec::/64
 2001:470:1f1d:1ef::/64
 2001:470:1f1d:207::/64
+2001:470:1f1d:218::/64
 2001:470:1f1d:23e::/64
+2001:470:1f1d:242::/64
 2001:470:1f1d:253::/64
 2001:470:1f1d:25a::/64
 2001:470:1f1d:277::/64
@@ -13232,6 +13260,7 @@
 2001:470:1f1f:98::/64
 2001:470:1f1f:a1::/64
 2001:470:1f1f:a3::/64
+2001:470:1f1f:a5::/64
 2001:470:1f1f:af::/64
 2001:470:1f1f:ce::/64
 2001:470:1f1f:f2::/63
@@ -13309,6 +13338,7 @@
 2001:470:1f23:b4::/64
 2001:470:1f23:c7::/64
 2001:470:1f23:eb::/64
+2001:470:1f23:11c::/64
 2001:470:1f23:137::/64
 2001:470:1f23:140::/64
 2001:470:1f23:34a::/64
@@ -13323,7 +13353,6 @@
 2001:470:1f27:35::/64
 2001:470:1f27:51::/64
 2001:470:1f27:6a::/64
-2001:470:1f27:6f::/64
 2001:470:1f27:d1::/64
 2001:470:1f27:db::/64
 2001:470:1f27:136::/64
@@ -13547,7 +13576,7 @@
 2001:470:317c::/48
 2001:470:319b::/48
 2001:470:319c::/46
-2001:470:3850::/48
+2001:470:38a4::/48
 2001:470:38aa::/47
 2001:470:38ac::/46
 2001:470:38b0::/46
@@ -13763,6 +13792,7 @@
 2001:470:6130::/48
 2001:470:6235::/48
 2001:470:6262::/48
+2001:470:6310::/48
 2001:470:6400::/48
 2001:470:683e::/48
 2001:470:684c::/48
@@ -13781,6 +13811,8 @@
 2001:470:7414::/48
 2001:470:749b::/48
 2001:470:7536::/48
+2001:470:758a::/48
+2001:470:758d::/48
 2001:470:75d9::/48
 2001:470:7911::/48
 2001:470:792b::/48
@@ -13829,7 +13861,7 @@
 2001:470:80a0::/48
 2001:470:80a4::/48
 2001:470:80a6::/48
-2001:470:80a9::/48
+2001:470:80a8::/47
 2001:470:80b7::/48
 2001:470:80bf::/48
 2001:470:80c7::/48
@@ -13973,6 +14005,7 @@
 2001:470:8af5::/48
 2001:470:8aff::/48
 2001:470:8b08::/48
+2001:470:8b2e::/48
 2001:470:8b44::/48
 2001:470:8b76::/48
 2001:470:8ba9::/48
@@ -13985,6 +14018,7 @@
 2001:470:b05f::/48
 2001:470:b06e::/48
 2001:470:b0e0::/48
+2001:470:b0eb::/48
 2001:470:b182::/48
 2001:470:b280::/48
 2001:470:b330::/48
@@ -14015,8 +14049,8 @@
 2001:470:b937::/48
 2001:470:b939::/48
 2001:470:b95d::/48
-2001:470:b961::/48
 2001:470:b965::/48
+2001:470:b984::/48
 2001:470:b9b0::/48
 2001:470:ba16::/48
 2001:470:ba4a::/48
@@ -14123,6 +14157,7 @@
 2001:470:e1d7::/48
 2001:470:e1ef::/48
 2001:470:e24a::/48
+2001:470:e259::/48
 2001:470:e27a::/48
 2001:470:e298::/48
 2001:470:e2df::/48
@@ -14159,10 +14194,12 @@
 2001:470:e9f5::/48
 2001:470:e9ff::/48
 2001:470:ea02::/48
+2001:470:ea08::/48
 2001:470:ea18::/48
 2001:470:ea26::/48
 2001:470:ea6a::/48
 2001:470:ea78::/48
+2001:470:ea7e::/48
 2001:470:ec02::/48
 2001:470:ec06::/48
 2001:470:ec09::/48
@@ -14175,7 +14212,6 @@
 2001:470:ec6c::/48
 2001:470:ec71::/48
 2001:470:ec73::/48
-2001:470:ec80::/48
 2001:470:ec82::/47
 2001:470:ec89::/48
 2001:470:ec9a::/47
@@ -14231,6 +14267,7 @@
 2001:470:eea4::/48
 2001:470:eea6::/47
 2001:470:eeb4::/48
+2001:470:eebc::/48
 2001:470:eec3::/48
 2001:470:eece::/48
 2001:470:ef75::/48
@@ -14370,7 +14407,8 @@
 2001:470:f1d4::/48
 2001:470:f1d9::/48
 2001:470:f1db::/48
-2001:470:f1dc::/46
+2001:470:f1dc::/48
+2001:470:f1de::/47
 2001:470:f1e0::/47
 2001:470:f1e5::/48
 2001:470:f1e8::/48
@@ -14410,12 +14448,15 @@
 2001:470:f267::/48
 2001:470:f26e::/48
 2001:470:f270::/48
+2001:470:f273::/48
+2001:470:f274::/48
 2001:470:f276::/48
 2001:470:f278::/48
+2001:470:f27a::/48
 2001:470:f281::/48
+2001:470:f282::/48
 2001:470:f28e::/48
 2001:470:f293::/48
-2001:470:f296::/48
 2001:470:f29c::/48
 2001:470:f2a2::/48
 2001:470:f2a5::/48
@@ -14524,7 +14565,7 @@
 2001:470:f846::/47
 2001:470:f848::/47
 2001:470:f84b::/48
-2001:470:f84c::/48
+2001:470:f84c::/47
 2001:470:f84e::/48
 2001:470:f850::/47
 2001:470:f852::/48
@@ -14536,6 +14577,7 @@
 2001:470:f862::/47
 2001:470:f864::/48
 2001:470:f866::/47
+2001:470:f869::/48
 2001:470:f86a::/48
 2001:470:f86f::/48
 2001:470:f870::/47
@@ -14702,7 +14744,6 @@
 2001:470:fa3a::/48
 2001:470:fa3c::/48
 2001:470:fa40::/47
-2001:470:fa42::/48
 2001:470:fa46::/48
 2001:470:fa48::/47
 2001:470:fa4b::/48
@@ -14765,7 +14806,7 @@
 2001:470:fac8::/48
 2001:470:facc::/46
 2001:470:fad0::/47
-2001:470:fad8::/48
+2001:470:fad5::/48
 2001:470:fada::/48
 2001:470:fae0::/48
 2001:470:fae4::/47
@@ -14790,6 +14831,7 @@
 2001:470:fb28::/48
 2001:470:fb32::/48
 2001:470:fb3b::/48
+2001:470:fb42::/48
 2001:470:fb46::/48
 2001:470:fb5b::/48
 2001:470:fb5c::/47
@@ -14930,6 +14972,7 @@
 2001:470:fe0b::/48
 2001:470:fe0c::/48
 2001:470:fe0e::/48
+2001:470:fe10::/48
 2001:470:fe1a::/48
 2001:470:fe1c::/48
 2001:470:fe20::/48
@@ -15672,6 +15715,10 @@
 2401:d8e0::/32
 2401:d920::/28
 2401:da00::/32
+2401:dbe0::/32
+2401:dd20::/32
+2401:dd60::/32
+2401:dde0::/32
 2401:de00::/32
 2401:e080::/32
 2401:e0c0::/32
@@ -16290,10 +16337,9 @@
 2404:2280:150::/48
 2404:2280:152::/48
 2404:2280:154::/46
-2404:2280:158::/46
+2404:2280:158::/45
-2404:2280:15c::/47
-2404:2280:15f::/48
 2404:2280:160::/48
+2404:2280:170::/48
 2404:2280:177::/48
 2404:2280:181::/48
 2404:2280:183::/48
@@ -16935,7 +16981,17 @@
 2406:840:d78::/45
 2406:840:d80::/41
 2406:840:e00::/39
-2406:840:1000::/37
+2406:840:1001::/48
+2406:840:1002::/47
+2406:840:1004::/46
+2406:840:1008::/45
+2406:840:1010::/44
+2406:840:1020::/43
+2406:840:1040::/42
+2406:840:1080::/41
+2406:840:1100::/40
+2406:840:1200::/39
+2406:840:1400::/38
 2406:840:1810::/44
 2406:840:1820::/43
 2406:840:1840::/43
@@ -17062,7 +17118,7 @@
 2406:840:e340::/42
 2406:840:e380::/41
 2406:840:e400::/40
-2406:840:e501::/48
+2406:840:e500::/47
 2406:840:e510::/44
 2406:840:e520::/43
 2406:840:e540::/42
@@ -17670,6 +17726,7 @@
 2600:70ff:f815::/48
 2600:70ff:f84b::/48
 2600:70ff:f852::/48
+2600:70ff:f856::/48
 2600:70ff:f884::/48
 2600:70ff:f892::/48
 2600:70ff:f8a9::/48
@@ -17729,6 +17786,10 @@
 2602:2a9:d10::/44
 2602:2e0:ff::/48
 2602:814:f006::/48
+2602:f795:c01::/48
+2602:f795:c02::/47
+2602:f795:c04::/47
+2602:f795:fa0::/48
 2602:f7ee:ee::/48
 2602:f93b:a00::/48
 2602:fa4f:600::/40
@@ -18114,7 +18175,6 @@
 2a04:4e41:27:1100::/56
 2a04:4e41:29:1::/64
 2a04:4e41:29:1100::/56
-2a04:4e41:30:1000::/56
 2a04:4e41:64:1::/64
 2a04:4e41:64:1100::/56
 2a04:4e41:12a2::/48
@@ -18168,9 +18228,9 @@
 2a06:1281:b400::/38
 2a06:1281:b800::/39
 2a06:3601::/32
-2a06:3603::/32
+2a06:3602::/31
 2a06:9f81:4100::/48
-2a06:9f81:4600::/43
+2a06:9f81:4600::/44
 2a06:9f81:4620::/44
 2a06:9f81:4640::/43
 2a06:9f81:4660::/44
@@ -18211,7 +18271,6 @@
 2a09:54c6:c000::/39
 2a09:54c6:c300::/40
 2a09:54c6:c400::/38
-2a09:b280:ff81::/48
 2a09:b280:ff83::/48
 2a09:b280:ff84::/47
 2a09:bac0:1000:5dc::/64
@@ -19271,12 +19330,16 @@
 2a0a:2845:b000::/36
 2a0a:2845:c000::/34
 2a0a:2846::/31
+2a0a:6040:3410::/48
+2a0a:6040:3430::/48
+2a0a:6040:34ff::/48
 2a0a:6040:d740::/48
 2a0a:6040:ec00::/40
 2a0a:6042:4100::/40
 2a0a:6044:6600::/39
 2a0a:6044:b800::/40
 2a0a:8f40:9::/48
+2a0b:b87:ffb5::/48
 2a0b:2542::/48
 2a0b:4340:550::/44
 2a0b:4e07:b8::/47
@@ -19377,7 +19440,7 @@
 2a0e:aa07:e1a0::/43
 2a0e:aa07:e1e1::/48
 2a0e:aa07:e1e2::/47
-2a0e:aa07:e1e4::/48
+2a0e:aa07:e1e4::/47
 2a0e:aa07:e200::/44
 2a0e:aa07:ec10::/44
 2a0e:aa07:f000::/48
@@ -19396,7 +19459,7 @@
 2a0e:b107:14a0::/44
 2a0e:b107:16b0::/44
 2a0e:b107:16c0::/44
-2a0e:b107:178c::/47
+2a0e:b107:178d::/48
 2a0e:b107:1a32:1000::/52
 2a0e:b107:1a34::/48
 2a0e:b107:2440::/44
@@ -19489,13 +19552,13 @@
 2a13:a5c3:f111::/48
 2a13:a5c3:f123::/48
 2a13:a5c3:f140::/42
+2a13:a5c3:f188::/48
 2a13:a5c3:f1c0::/44
 2a13:a5c3:f1f0::/44
 2a13:a5c3:ff10::/44
 2a13:a5c6:9100::/40
 2a13:a5c7:1604::/48
-2a13:a5c7:1801::/48
+2a13:a5c7:1800::/40
-2a13:a5c7:1804::/46
 2a13:a5c7:2100::/48
 2a13:a5c7:2102::/48
 2a13:a5c7:2109::/48
@@ -19510,16 +19573,16 @@
 2a13:df85:be00::/43
 2a14:1c4:9800::/37
 2a14:7c0:4a01::/48
-2a14:7c0:4d00::/47
-2a14:7c0:4d02::/48
 2a14:7c0:5208::/48
 2a14:4b00:5c00::/38
 2a14:4c41::/32
 2a14:67c1:20::/44
 2a14:67c1:70::/46
+2a14:67c1:74::/48
 2a14:67c1:510::/44
+2a14:67c1:520::/44
 2a14:67c1:610::/44
-2a14:67c1:1000::/38
+2a14:67c1:1000::/37
 2a14:7580:9200::/40
 2a14:7580:c000::/35
 2a14:7580:e200::/47