Merge remote-tracking branch 'upstream/master'

2020-02-09 18:06:32 +08:00
parent 8e05324f36 a61e68810a
commit 02989df3cc
41 changed files with 104 additions and 11 deletions
--- a/data/928plus
+++ b/data/928plus
@ -0,0 +1,2 @@
+928.plus
+zind.cloud
--- a/data/aaex
+++ b/data/aaex
@ -0,0 +1 @@
+aaex.uk
--- a/data/adcolony-ads
+++ b/data/adcolony-ads
@ -0,0 +1 @@
+adcolony.com @ads
--- a/data/amytele
+++ b/data/amytele
@ -0,0 +1 @@
+amytele.com
--- a/data/baicaonetwork
+++ b/data/baicaonetwork
@ -0,0 +1 @@
+baicaonetwork.com
--- a/data/bighead
+++ b/data/bighead
@ -0,0 +1 @@
+bighead.group
--- a/data/blinkload
+++ b/data/blinkload
@ -0,0 +1 @@
+blinkload.zone
--- a/data/boslife
+++ b/data/boslife
@ -0,0 +1,2 @@
+boslife.biz
+boslife.net
--- a/data/bttzyw
+++ b/data/bttzyw
@ -0,0 +1,4 @@
+btt804.com
+btt904.com
+bttzyw.com
+bttzyw.net
--- a/data/category-porn
+++ b/data/category-porn
@ -1,6 +1,7 @@
 include:91porn
 include:avgle
 include:beeg
+include:bttzyw
 include:caoliu
 include:chaturbate
 include:eporner
@ -10,6 +11,7 @@ include:hqporner
 include:javbus
 include:javfinder
 include:javhd
+include:javlibrary
 include:javwide
 include:kindgirls
 include:metart
@ -17,9 +19,11 @@ include:netflav
 include:pigav
 include:pornhd
 include:pornhub
+include:press
 include:redtube
 include:theporndude
 include:tube8
+include:vaginacontest
 include:xart
 include:xhamster
 include:xnxx
--- a/data/category-vpnservices
+++ b/data/category-vpnservices
@ -0,0 +1,34 @@
+# Disclaimer: We do NOT endorse or claim that the VPN services below are legal or safe, please use at your own risk and observe local laws, rules and regulations.
+
+# Reference: https://duyaoss.com/archives/3/
+include:928plus
+include:aaex
+include:amytele
+include:baicaonetwork
+include:bighead
+include:blinkload
+include:boslife
+include:cloudn
+include:conair
+include:cordcloud
+include:ctyun
+include:cylink
+include:dlercloud
+include:duyaoss
+include:hitun
+include:maying
+include:miaopasi
+include:mocloudplus
+include:mray
+include:muncloud
+include:n3ro
+include:nexitally
+include:paofuyun
+include:renzhe
+include:rixcloud
+include:shadowsockscom
+include:ssplive
+include:ssrcloud
+include:ssrpass
+include:stcserver
+include:surflite
--- a/data/change
+++ b/data/change
@ -0,0 +1 @@
+change.org
--- a/data/chinapower
+++ b/data/chinapower
@ -0,0 +1 @@
+full:chinapower.csis.org
--- a/data/cloudn
+++ b/data/cloudn
@ -0,0 +1 @@
+cloudn.me
--- a/data/conair
+++ b/data/conair
@ -0,0 +1 @@
+conair.me
--- a/data/cordcloud
+++ b/data/cordcloud
@ -0,0 +1 @@
+cordcloud.org
--- a/data/csis
+++ b/data/csis
@ -0,0 +1,3 @@
+csis.org
+
+full:csis-prod.s3.amazonaws.com
--- a/data/ctyun
+++ b/data/ctyun
@ -0,0 +1 @@
+ctyun.online
--- a/data/cylink
+++ b/data/cylink
@ -0,0 +1,2 @@
+cylink.pro
+cylink0122.icu
--- a/data/dlercloud
+++ b/data/dlercloud
@ -1,3 +1,4 @@
 dlercloud.com
 dlercloud.org
 dlercloud.me
+dleris.best
--- a/data/geolocation-!cn
+++ b/data/geolocation-!cn
@ -1,6 +1,9 @@
 # This list contains domains that don't have access point in China. This is opposite to geolocation-cn.

-# VPN tools and services & Privacy protection & Anti-GFW & Anti-censorship
+# VPN services
+include:category-vpnservices
+
+# VPN tools & Privacy protection & Anti-GFW & Anti-censorship
 # References:
 # https://github.com/danoctavian/awesome-anti-censorship
 # https://github.com/KevinColemanInc/awesome-privacy
@ -10,8 +13,6 @@ include:browserleaks
 include:bypasscensorship
 include:datfoundation
 include:democracyearth
-include:dlercloud
-include:duyaoss
 include:eff
 include:epicbrowser
 include:ffprofile
@ -25,14 +26,11 @@ include:i2p
 include:ipfs
 include:jitsi
 include:lantern
-include:maying
-include:nexitally
 include:ntc
 include:onionshare
 include:ooni
 include:openvpn
 include:psiphon
-include:rixcloud
 include:shadowsocks
 include:softether
 include:stunnel
@ -164,6 +162,8 @@ include:wenzhao

 # Organizations
 include:archive
+include:change
+include:csis
 include:globalsecurity
 include:who
 include:wikimedia
@ -171,6 +171,7 @@ include:wto

 # Science & Technology & Knowledge
 include:acm
+include:chinapower
 include:computingreviews
 include:elsevier
 include:ieee
--- a/data/google-ads
+++ b/data/google-ads
@ -9,3 +9,4 @@ googleanalytics.com
 googlesyndication.com
 googletagmanager.com
 googletagservices.com
+adservice.google.com
--- a/data/hitun
+++ b/data/hitun
@ -0,0 +1,2 @@
+hitun.io
+xn--90wwvt03e.com # 海豚湾.com
--- a/data/javlibrary
+++ b/data/javlibrary
@ -0,0 +1 @@
+javlibrary.com
--- a/data/miaopasi
+++ b/data/miaopasi
@ -0,0 +1 @@
+xn--i2ru8q2qg.com # 喵帕斯.com
--- a/data/mocloudplus
+++ b/data/mocloudplus
@ -0,0 +1 @@
+mocloudplus.com
--- a/data/mray
+++ b/data/mray
@ -0,0 +1 @@
+mray.club
--- a/data/muncloud
+++ b/data/muncloud
@ -0,0 +1 @@
+muncloud.dog
--- a/data/n3ro
+++ b/data/n3ro
@ -0,0 +1,3 @@
+n3ro.fun
+n3ro.live
+n3ro.net
--- a/data/nexitally
+++ b/data/nexitally
@ -1,2 +1,3 @@
 nexitally.com
+nexitallysafe.com
 nexitcore.com
--- a/data/paofuyun
+++ b/data/paofuyun
@ -0,0 +1,2 @@
+paofu.cloud
+paofuyun.me
--- a/data/press
+++ b/data/press
@ -0,0 +1 @@
+press.vin
--- a/data/renzhe
+++ b/data/renzhe
@ -0,0 +1 @@
+renzhe.cloud
--- a/data/shadowsockscom
+++ b/data/shadowsockscom
@ -0,0 +1,2 @@
+shadowsocks.com
+shadowsocks.nl
--- a/data/ssplive
+++ b/data/ssplive
@ -0,0 +1 @@
+ssplive.pw
--- a/data/ssrcloud
+++ b/data/ssrcloud
@ -0,0 +1,4 @@
+china-internet-exchange.com
+cxkcloud.com
+ssrcloud.com
+ssrcloud.org
--- a/data/ssrpass
+++ b/data/ssrpass
@ -0,0 +1 @@
+ssrpass.pw
--- a/data/stcserver
+++ b/data/stcserver
@ -0,0 +1 @@
+stc-server.com
--- a/data/surflite
+++ b/data/surflite
@ -0,0 +1,2 @@
+surflite.co
+surflite.net
--- a/data/vaginacontest
+++ b/data/vaginacontest
@ -0,0 +1 @@
+vaginacontest.com