Merge remote-tracking branch 'upstream/master'

README.md

@@ -4,7 +4,7 @@ This project manages a list of domains, to be used as geosites for routing purpo
 
 ## Purpose of this project
 
-This project contains only lists of domains. It is not opinionated, such as a domain should be blocked, or a domain should be proxied. This list can be used to generate routing rules on demand.
+This project is not opinionated. In other words, it does NOT endorse, claim or imply that a domain should be blocked or proxied. It can be used to generate routing rules on demand.
 
 ## Structure of data
 
@@ -26,7 +26,7 @@ Syntax:
 * Subdomain begins with `domain:`, followed by a valid domain name. The prefix `domain:` may be omitted.
 * Keyword begins with `keyword:`, followed by a string.
 * Regular expression begins with `regex:`, followed by a valid regular expression (per Golang's standard).
-* Full domain begins with `full:`, followed by a domain.
+* Full domain begins with `full:`, followed by a complete and valid domain name.
 * Domains (including `domain`, `keyword`, `regex` and `full`) may have one or more attributes. Each attribute begins with `@` and followed by the name of the attribute.
 
 ## How it works
@@ -40,8 +40,8 @@ To generate a section:
 3. Omit all empty lines.
 4. Generate each `domain:` line into a [sub-domain routing rule](https://github.com/v2ray/v2ray-core/blob/master/app/router/config.proto#L21).
 5. Generate each `keyword:` line into a [plain domain routing rule](https://github.com/v2ray/v2ray-core/blob/master/app/router/config.proto#L17).
-6. Generate each `regex:` line into a [regex domain routing rule](https://github.com/v2ray/v2ray-core/blob/master/app/router/config.proto#L19)
-7. Generate each `full:` line into a [full domain routing rule](https://github.com/v2ray/v2ray-core/blob/master/app/router/config.proto#L23)
+6. Generate each `regex:` line into a [regex domain routing rule](https://github.com/v2ray/v2ray-core/blob/master/app/router/config.proto#L19).
+7. Generate each `full:` line into a [full domain routing rule](https://github.com/v2ray/v2ray-core/blob/master/app/router/config.proto#L23).
 
 ## How to organize domains
 
@@ -57,4 +57,4 @@ Attribute is useful for sub-group of domains, especially for filtering purpose.
 
 * Please begin with small size PRs, say modification in a single file.
 * A PR must be reviewed and approved by another member.
-* After a few successful PRs, you may applied for manager access of this repository.
+* After a few successful PRs, you may apply for manager access of this repository.

data/928plus

@@ -0,0 +1,2 @@
+928.plus
+zind.cloud

data/aaex

@@ -0,0 +1 @@
+aaex.uk

data/adcolony-ads

@@ -0,0 +1 @@
+adcolony.com @ads

data/amytele

@@ -0,0 +1 @@
+amytele.com

data/baicaonetwork

@@ -0,0 +1 @@
+baicaonetwork.com

data/bighead

@@ -0,0 +1 @@
+bighead.group

data/blinkload

@@ -0,0 +1 @@
+blinkload.zone

data/boslife

@@ -0,0 +1,2 @@
+boslife.biz
+boslife.net

data/bttzyw

@@ -0,0 +1,4 @@
+btt804.com
+btt904.com
+bttzyw.com
+bttzyw.net

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

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

data/change

@@ -0,0 +1 @@
+change.org

data/chinapower

@@ -0,0 +1 @@
+full:chinapower.csis.org

data/cloudn

@@ -0,0 +1 @@
+cloudn.me

data/conair

@@ -0,0 +1 @@
+conair.me

data/cordcloud

@@ -0,0 +1 @@
+cordcloud.org

data/csis

@@ -0,0 +1,3 @@
+csis.org
+
+full:csis-prod.s3.amazonaws.com

data/ctyun

@@ -0,0 +1 @@
+ctyun.online

data/cylink

@@ -0,0 +1,2 @@
+cylink.pro
+cylink0122.icu

data/dlercloud

@@ -1,3 +1,4 @@
 dlercloud.com
 dlercloud.org
 dlercloud.me
+dleris.best

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

data/google-ads

@@ -9,3 +9,4 @@ googleanalytics.com
 googlesyndication.com
 googletagmanager.com
 googletagservices.com
+adservice.google.com

data/hitun

@@ -0,0 +1,2 @@
+hitun.io
+xn--90wwvt03e.com # 海豚湾.com

data/javlibrary

@@ -0,0 +1 @@
+javlibrary.com

data/miaopasi

@@ -0,0 +1 @@
+xn--i2ru8q2qg.com # 喵帕斯.com

data/mocloudplus

@@ -0,0 +1 @@
+mocloudplus.com

data/mray

@@ -0,0 +1 @@
+mray.club

data/muncloud

@@ -0,0 +1 @@
+muncloud.dog

data/n3ro

@@ -0,0 +1,3 @@
+n3ro.fun
+n3ro.live
+n3ro.net

data/nexitally

@@ -1,2 +1,3 @@
 nexitally.com
+nexitallysafe.com
 nexitcore.com

data/paofuyun

@@ -0,0 +1,2 @@
+paofu.cloud
+paofuyun.me

data/press

@@ -0,0 +1 @@
+press.vin

data/renzhe

@@ -0,0 +1 @@
+renzhe.cloud

data/shadowsockscom

@@ -0,0 +1,2 @@
+shadowsocks.com
+shadowsocks.nl

data/ssplive

@@ -0,0 +1 @@
+ssplive.pw

data/ssrcloud

@@ -0,0 +1,4 @@
+china-internet-exchange.com
+cxkcloud.com
+ssrcloud.com
+ssrcloud.org

data/ssrpass

@@ -0,0 +1 @@
+ssrpass.pw

data/stcserver

@@ -0,0 +1 @@
+stc-server.com

data/surflite

@@ -0,0 +1,2 @@
+surflite.co
+surflite.net

data/vaginacontest

@@ -0,0 +1 @@
+vaginacontest.com