From faafade82efeb86079fc04c0f6e897d96ad86e4b Mon Sep 17 00:00:00 2001 From: loyalsoldier Date: Thu, 27 Feb 2020 15:11:45 +0800 Subject: [PATCH 1/5] Add protonmail sub-list --- data/protonmail | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/protonmail diff --git a/data/protonmail b/data/protonmail new file mode 100644 index 00000000..ef943d59 --- /dev/null +++ b/data/protonmail @@ -0,0 +1,3 @@ +protonmail.com +protonstatus.com +pm.me From fe65e032a9350415a53296d5ac1cfcb4c4cd487a Mon Sep 17 00:00:00 2001 From: loyalsoldier Date: Thu, 27 Feb 2020 15:11:56 +0800 Subject: [PATCH 2/5] Add cnbc sub-list --- data/cnbc | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/cnbc diff --git a/data/cnbc b/data/cnbc new file mode 100644 index 00000000..0464c45d --- /dev/null +++ b/data/cnbc @@ -0,0 +1,4 @@ +cnbc.com +cnbcfm.com +nbcuni.com +nbcudigitaladops.com From 825ff461b5acdf751c67b73f2e2a62f7efa019bc Mon Sep 17 00:00:00 2001 From: loyalsoldier Date: Thu, 27 Feb 2020 15:12:26 +0800 Subject: [PATCH 3/5] Include protonmail & cnbc into geolocation-!cn category --- data/geolocation-!cn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/geolocation-!cn b/data/geolocation-!cn index 42982ef9..0a422075 100644 --- a/data/geolocation-!cn +++ b/data/geolocation-!cn @@ -111,6 +111,7 @@ include:imgur include:infrapedia include:netlify include:pinterest +include:protonmail include:startpage include:steemit include:tumblr @@ -151,6 +152,7 @@ include:bbc include:boxun include:caijinglengyan include:chinadigitaltimes +include:cnbc include:cnn include:d100 include:dw From a720d135d107fefc42565b87fd909bed371fa8e1 Mon Sep 17 00:00:00 2001 From: loyalsoldier Date: Thu, 27 Feb 2020 15:16:46 +0800 Subject: [PATCH 4/5] Add category-media --- data/category-media | 38 ++++++++++++++++++++++++++++++++++ data/geolocation-!cn | 49 ++++++-------------------------------------- 2 files changed, 44 insertions(+), 43 deletions(-) create mode 100644 data/category-media diff --git a/data/category-media b/data/category-media new file mode 100644 index 00000000..79bd77b2 --- /dev/null +++ b/data/category-media @@ -0,0 +1,38 @@ +include:appledaily +include:bbc +include:boxun +include:caijinglengyan +include:chinadigitaltimes +include:cnbc +include:cnn +include:d100 +include:dw +include:fox +include:globalvoices +include:guo +include:hk01 +include:inmediahk +include:jfengtime +include:ltn +include:matters +include:medium +include:myradio +include:nikkei +include:ntd +include:nytimes +include:passiontimes +include:reuters +include:rfa +include:rfi +include:rsf +include:rthk +include:scmp +include:sinoinsider +include:soundofhope +include:thestandnews +include:udn +include:voanews +include:washingtonpost +include:watchout +include:wenzhao +include:zaobao diff --git a/data/geolocation-!cn b/data/geolocation-!cn index 0a422075..661e9c12 100644 --- a/data/geolocation-!cn +++ b/data/geolocation-!cn @@ -3,6 +3,12 @@ # VPN services include:category-vpnservices +# Porn +include:category-porn + +# News & Press & Media +include:category-media + # VPN tools & Privacy protection & Anti-GFW & Anti-censorship # References: # https://github.com/danoctavian/awesome-anti-censorship @@ -146,46 +152,6 @@ include:pincong include:quora include:reddit -# News & Press & Media -include:appledaily -include:bbc -include:boxun -include:caijinglengyan -include:chinadigitaltimes -include:cnbc -include:cnn -include:d100 -include:dw -include:fox -include:globalvoices -include:guo -include:hk01 -include:inmediahk -include:jfengtime -include:ltn -include:matters -include:medium -include:myradio -include:nikkei -include:ntd -include:nytimes -include:passiontimes -include:reuters -include:rfa -include:rfi -include:rsf -include:rthk -include:scmp -include:sinoinsider -include:soundofhope -include:thestandnews -include:udn -include:voanews -include:washingtonpost -include:watchout -include:wenzhao -include:zaobao - # Organizations include:archive include:change @@ -212,9 +178,6 @@ include:clarivate include:pubmatic include:taboola -# Porn -include:category-porn - # Others include:huanghuagang include:rarbg From 9cc8acaa5362a36e9a7de2df8851128c14136e39 Mon Sep 17 00:00:00 2001 From: loyalsoldier Date: Thu, 27 Feb 2020 15:23:01 +0800 Subject: [PATCH 5/5] Add category-anticensorship --- data/category-anticensorship | 40 ++++++++++++++++++++++++++++++ data/geolocation-!cn | 48 +++--------------------------------- 2 files changed, 43 insertions(+), 45 deletions(-) create mode 100644 data/category-anticensorship diff --git a/data/category-anticensorship b/data/category-anticensorship new file mode 100644 index 00000000..d7105778 --- /dev/null +++ b/data/category-anticensorship @@ -0,0 +1,40 @@ +include:ahmia +include:akasha +include:browserleaks +include:bypasscensorship +include:citizenlab +include:datfoundation +include:democracyearth +include:eff +include:epicbrowser +include:ffprofile +include:freenet +include:fteproxy +include:gfw +include:greatfire +include:guardianproject +include:haveibeenpwned +include:i2p +include:ipfs +include:jitsi +include:lantern +include:ntc +include:onionshare +include:ooni +include:openvpn +include:psiphon +include:shadowsocks +include:softether +include:stunnel +include:telex +include:torproject +include:tribler +include:tunsafe +include:twister +include:uproxy +include:v2ray +include:vuvuzela +include:whonix +include:wikileaks +include:wireguard +include:zeronet diff --git a/data/geolocation-!cn b/data/geolocation-!cn index 661e9c12..198b1cdb 100644 --- a/data/geolocation-!cn +++ b/data/geolocation-!cn @@ -3,57 +3,15 @@ # VPN services include:category-vpnservices +# VPN tools & Privacy protection & Anti-GFW & Anti-censorship +include:category-anticensorship + # Porn include:category-porn # News & Press & Media include:category-media -# VPN tools & Privacy protection & Anti-GFW & Anti-censorship -# References: -# https://github.com/danoctavian/awesome-anti-censorship -# https://github.com/KevinColemanInc/awesome-privacy -include:ahmia -include:akasha -include:browserleaks -include:bypasscensorship -include:citizenlab -include:datfoundation -include:democracyearth -include:eff -include:epicbrowser -include:ffprofile -include:freenet -include:fteproxy -include:gfw -include:greatfire -include:guardianproject -include:haveibeenpwned -include:i2p -include:ipfs -include:jitsi -include:lantern -include:ntc -include:onionshare -include:ooni -include:openvpn -include:psiphon -include:shadowsocks -include:softether -include:stunnel -include:telex -include:torproject -include:tribler -include:tunsafe -include:twister -include:uproxy -include:v2ray -include:vuvuzela -include:whonix -include:wikileaks -include:wireguard -include:zeronet - # Tech companies & Orginations include:adobe include:amazon