Merge tag '4.2.0.1' into v5/master

# Conflicts:
#	shadowsocks-csharp/Controller/Service/UpdateChecker.cs

CHANGES

@@ -1,3 +1,6 @@
+4.2.0.1 2020-09-26
+- Fix domain rule handling in PAC script (#2956)
+
 4.2.0.0 2020-09-10
 - Update TCPHandler.lastActivity (#2858)
 - Add Franch translation (#2861)

shadowsocks-csharp/Data/abp.js

@@ -6,8 +6,21 @@
 // 2019-02-08: Updated to support shadowsocks-windows user rules.
 
 var proxy = __PROXY__;
-var userrules = __USERRULES__;
-var rules = __RULES__;
+var userrules = [];
+var rules = [];
+
+// convert to abp grammar
+for (var i = 0; i < __RULES__.length; i++) {
+    var s = __RULES__[i];
+    if (s.substring(0, 2) == "||") s += "^";
+    rules.push(s);
+}
+
+for (var i = 0; i < __USERRULES__.length; i++) {
+    var s = __USERRULES__[i];
+    if (s.substring(0, 2) == "||") s += "^";
+    userrules.push(s);
+}
 
 /*
 * This file is part of Adblock Plus <http://adblockplus.org/>,