From 583a1d5d595b04a9b2e2ebbcedd1190a6f89c33d Mon Sep 17 00:00:00 2001 From: Changxu Date: Fri, 9 Oct 2015 10:10:27 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lists/auto.py | 1 + whitelist.pac | 1 + 2 files changed, 2 insertions(+) diff --git a/lists/auto.py b/lists/auto.py index ecfd22b..16bea7e 100644 --- a/lists/auto.py +++ b/lists/auto.py @@ -5664,6 +5664,7 @@ def getlist(): linkhx.com linkwan.com linuxdiyf.com +linuxlearn.net linxi.net linyiren.com lipu.net diff --git a/whitelist.pac b/whitelist.pac index e25189c..76f4314 100644 --- a/whitelist.pac +++ b/whitelist.pac @@ -8866,6 +8866,7 @@ var white_domains = {"am":{ "li63":1, "lingw":1, "lingyuan":1, +"linuxlearn":1, "linxi":1, "lipu":1, "liuxue51":1, From 2a2456704c369a56825a9f1ebd785fe3c6deb698 Mon Sep 17 00:00:00 2001 From: Changxu Date: Wed, 18 Nov 2015 11:41:59 +0800 Subject: [PATCH 02/11] update whitelist.pac --- whitelist.pac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whitelist.pac b/whitelist.pac index 76f4314..967b1fc 100644 --- a/whitelist.pac +++ b/whitelist.pac @@ -1,4 +1,4 @@ -var wall_proxy = "SOCKS5 127.0.0.1:1080; SOCKS 127.0.0.1:1080;"; +var wall_proxy = "SOCKS5 127.0.0.1:1080; SOCKS 127.0.0.1080;"; var nowall_proxy = "DIRECT;"; var direct = "DIRECT;"; var ip_proxy = "DIRECT;"; @@ -1559,6 +1559,8 @@ var white_domains = {"am":{ "abchina":1, "ablesky":1, "accgame":1, +"acfun":1, +"acgvideo":1, "aci-wh":1, "acs86":1, "acshoes":1, @@ -9572,6 +9574,7 @@ var white_domains = {"am":{ "9555":1, "9928":1, "9998":1, +"acfun":1, "acg":1, "bilibili":1, "caoxian":1, From d511b28a04b0b58ddfefd9c538d44cd5040846f6 Mon Sep 17 00:00:00 2001 From: Changxu Date: Wed, 18 Nov 2015 11:44:50 +0800 Subject: [PATCH 03/11] add tower.im --- lists/pop.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lists/pop.py b/lists/pop.py index 0f431cf..97ebb61 100644 --- a/lists/pop.py +++ b/lists/pop.py @@ -104,6 +104,7 @@ def getlist(): staticsdo.com tanx.com tdimg.com +tower.im tremormedia.com v2ex.com vizu.com From 596de717d26b99ff54340daafd7ccee555d571ca Mon Sep 17 00:00:00 2001 From: Changxu Date: Wed, 18 Nov 2015 11:45:02 +0800 Subject: [PATCH 04/11] add tower.im --- whitelist.pac | 1 + 1 file changed, 1 insertion(+) diff --git a/whitelist.pac b/whitelist.pac index 967b1fc..7a4129b 100644 --- a/whitelist.pac +++ b/whitelist.pac @@ -8298,6 +8298,7 @@ var white_domains = {"am":{ "cli":1, "iapps":1, "iyy":1, +"tower":1, "yixin":1 },"info":{ "gmold":1, From 0f1c3edc8b255011d6f4b0ef46b60235f091a567 Mon Sep 17 00:00:00 2001 From: Changxu Date: Thu, 19 Nov 2015 12:35:04 +0800 Subject: [PATCH 05/11] update whitelist.pac --- whitelist.pac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/whitelist.pac b/whitelist.pac index 7a4129b..90a73f0 100644 --- a/whitelist.pac +++ b/whitelist.pac @@ -1,4 +1,4 @@ -var wall_proxy = "SOCKS5 127.0.0.1:1080; SOCKS 127.0.0.1080;"; +var wall_proxy = "SOCKS5 127.0.0.1:1080; SOCKS 127.0.0.1:1080;"; var nowall_proxy = "DIRECT;"; var direct = "DIRECT;"; var ip_proxy = "DIRECT;"; From 93b3c55b18fd6c15f13200b261dff81ac7eaea40 Mon Sep 17 00:00:00 2001 From: Changxu Date: Thu, 19 Nov 2015 19:36:45 +0800 Subject: [PATCH 06/11] add ele.me --- lists/auto.py | 1 + whitelist.pac | 1 + 2 files changed, 2 insertions(+) diff --git a/lists/auto.py b/lists/auto.py index 16bea7e..1dcd3a4 100644 --- a/lists/auto.py +++ b/lists/auto.py @@ -3521,6 +3521,7 @@ def getlist(): ekaidian.com elanw.com eldawa.com +ele.me ele001.com elecfans.com elecinfo.com diff --git a/whitelist.pac b/whitelist.pac index 90a73f0..2281d89 100644 --- a/whitelist.pac +++ b/whitelist.pac @@ -8326,6 +8326,7 @@ var white_domains = {"am":{ "21me":1, "bole":1, "dzj":1, +"ele":1, "kyhs":1, "nanxi":1, "shijue":1, From 573611f4a87ca96f160979e0509de33901c5149b Mon Sep 17 00:00:00 2001 From: Changxu Date: Sun, 22 Nov 2015 16:44:12 +0800 Subject: [PATCH 07/11] add ncar.cc --- lists/auto.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lists/auto.py b/lists/auto.py index 1dcd3a4..51bc0d7 100644 --- a/lists/auto.py +++ b/lists/auto.py @@ -6159,6 +6159,7 @@ def getlist(): nbyouth.com nbzhaopin.net nc2sc.com +ncar.cc ncdiy.com ncmgcc.com ncxww.com From fa3f24538a34bc8740f9a86ceacf33623d266789 Mon Sep 17 00:00:00 2001 From: Changxu Date: Fri, 4 Dec 2015 10:19:36 +0800 Subject: [PATCH 08/11] add ieee.org --- lists/auto.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lists/auto.py b/lists/auto.py index 51bc0d7..cf14144 100644 --- a/lists/auto.py +++ b/lists/auto.py @@ -4791,6 +4791,7 @@ def getlist(): iecity.com iecworld.com iedu.sg +ieee.org iefang.com iezhan.com ifeng.com From bdeb9f4546d5a4212dceea3a77d7279f75ebb29a Mon Sep 17 00:00:00 2001 From: Changxu Date: Fri, 4 Dec 2015 10:20:52 +0800 Subject: [PATCH 09/11] update whitelist.pac --- whitelist.pac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/whitelist.pac b/whitelist.pac index 2281d89..351bc37 100644 --- a/whitelist.pac +++ b/whitelist.pac @@ -126,6 +126,7 @@ var white_domains = {"am":{ "mzsky":1, "n21":1, "nandagang":1, +"ncar":1, "pingyin":1, "pinjie":1, "pp":1, @@ -9412,6 +9413,7 @@ var white_domains = {"am":{ "hykaoyan":1, "hynews":1, "hzgh":1, +"ieee":1, "infx":1, "it-home":1, "jiaj":1, From c4686ac8fde5c4744f173b43f410977df325243d Mon Sep 17 00:00:00 2001 From: Changxu Date: Fri, 13 May 2016 19:56:10 +0800 Subject: [PATCH 10/11] update whitelist --- lists/auto.py | 1 + lists/custom.py | 2 ++ whitelist.pac | 5 +++++ 3 files changed, 8 insertions(+) diff --git a/lists/auto.py b/lists/auto.py index cf14144..d5eb2ad 100644 --- a/lists/auto.py +++ b/lists/auto.py @@ -8003,6 +8003,7 @@ def getlist(): vivijk.com vjia.com vlongbiz.com +vnet.link vmall.com vmovier.com vobao.com diff --git a/lists/custom.py b/lists/custom.py index 609e8eb..f4c80d7 100644 --- a/lists/custom.py +++ b/lists/custom.py @@ -3,5 +3,7 @@ def getlist(): liststr = """ +lab309.tech +ytcz.net """ return set(liststr.splitlines(False)) diff --git a/whitelist.pac b/whitelist.pac index 351bc37..2d2535f 100644 --- a/whitelist.pac +++ b/whitelist.pac @@ -8323,6 +8323,8 @@ var white_domains = {"am":{ "iz":1, "qzone":1, "ulinix":1 +},"link":{ +"vnet":1 },"me":{ "21me":1, "bole":1, @@ -9204,6 +9206,7 @@ var white_domains = {"am":{ "yongyao":1, "youxi5":1, "yoyone":1, +"ytcz":1, "yx618":1, "yxjy":1, "yxol":1, @@ -9558,6 +9561,8 @@ var white_domains = {"am":{ "shengqian":1, "soutudi":1, "wangxiao":1 +},"tech":{ +"lab309":1 },"tm":{ "stone":1 },"tv":{ From 5799006e3cfae51e12a479bf52b7b7974bea4c53 Mon Sep 17 00:00:00 2001 From: Changxu Date: Mon, 15 Aug 2016 19:24:21 +0800 Subject: [PATCH 11/11] add springer --- lists/pop.py | 1 + whitelist.pac | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lists/pop.py b/lists/pop.py index 97ebb61..ec70848 100644 --- a/lists/pop.py +++ b/lists/pop.py @@ -102,6 +102,7 @@ def getlist(): sinajs.com snyu.com staticsdo.com +springer.com tanx.com tdimg.com tower.im diff --git a/whitelist.pac b/whitelist.pac index 2d2535f..48e9a58 100644 --- a/whitelist.pac +++ b/whitelist.pac @@ -3017,6 +3017,7 @@ var white_domains = {"am":{ "dospy":1, "dostor":1, "douban":1, +"doubanio":1, "douguo":1, "douluodalu123":1, "douxie":1, @@ -5775,7 +5776,6 @@ var white_domains = {"am":{ "ptbus":1, "ptdao":1, "ptjy":1, -"ptlogin2.qq":1, "ptotour":1, "ptpcp":1, "puahome":1, @@ -6458,6 +6458,7 @@ var white_domains = {"am":{ "spjobhr":1, "spjxcn":1, "sportscn":1, +"springer":1, "springtour":1, "spsb114":1, "spzs":1,