🔀 Merge branch 'master' into v5/master

CHANGES

@@ -1,3 +1,9 @@
+4.3.1.0 2020-10-25
+- Update abp.js (#2999)
+- Separate QR code scanning from MenuViewController (#2995)
+- Remove statistics strategy (#2994)
+- Other minor bug fixes and improvements
+
 4.3.0.0 2020-10-19
 - Cleanup and update dependencies (#2983)
 - Geosite group validation + PAC regeneration on version update (#2988)

Shadowsocks/Assets/abp.js

@@ -10,15 +10,16 @@ var userrules = [];
 var rules = [];
 
 // convert to abp grammar
+var re = /^(@@)?\|\|.*?[^\^]$/;
 for (var i = 0; i < __RULES__.length; i++) {
     var s = __RULES__[i];
-    if (s.substring(0, 2) == "||") s += "^";
+    if (s.match(re)) s += "^";
     rules.push(s);
 }
 
 for (var i = 0; i < __USERRULES__.length; i++) {
     var s = __USERRULES__[i];
-    if (s.substring(0, 2) == "||") s += "^";
+    if (s.match(re))  s += "^";
     userrules.push(s);
 }
 

appveyor.yml

@@ -11,7 +11,7 @@
 
 # version format
 # Build version format is taken from UI if it is not set
-# version: 1.0.{build}
+version: 4.3.1.{build}
 
 # # branches to build
 # branches: