Merge remote-tracking branch 'v2ray/master'

6 years ago · 730652fe57
parent 19a9e6cbf7 1f346a2f5d
commit 730652fe57
32 changed files with 70 additions and 13 deletions
--- a/data/boxun
+++ b/data/boxun
@ -0,0 +1,2 @@
+boxun.com
+bowenpress.com
--- a/data/bypasscensorship
+++ b/data/bypasscensorship
@ -0,0 +1 @@
+bypasscensorship.org
--- a/data/chinadigitaltimes
+++ b/data/chinadigitaltimes
@ -0,0 +1 @@
+chinadigitaltimes.net
--- a/data/cnn
+++ b/data/cnn
@ -0,0 +1 @@
+cnn.com
--- a/data/discord
+++ b/data/discord
@ -1,3 +1,4 @@
 discordapp.com
 discord.gg
+discord.media
 discordapp.net
--- a/data/dw
+++ b/data/dw
@ -0,0 +1 @@
+dw.com
--- a/data/facebook
+++ b/data/facebook
@ -2,7 +2,7 @@ cdninstagram.com
 facebook.br
 facebook.com
 facebook.design
-connect.facebook.net
+facebook.net
 facebook.hu
 facebook.in
 facebook.nl
--- a/data/faststone
+++ b/data/faststone
@ -0,0 +1 @@
+faststone.org
--- a/data/geolocation-!cn
+++ b/data/geolocation-!cn
@ -3,18 +3,32 @@
 include:adobe
 include:amazon
 include:apkpure
+include:apple
 include:archive
 include:avgle
 include:bbc
 include:bestbuy
+include:boxun
+include:bypasscensorship
+include:chinadigitaltimes
+include:cnn
 include:discord
 include:dropbox
 include:duckduckgo
+include:dw
 include:ebay
 include:facebook
+include:faststone
+include:gfw
 include:github
 include:gitlab
+include:globalvoices
 include:google
+include:greatfire
+include:guo
+include:hk01
+include:huanghuagang
+include:infrapedia
 include:jetbrains
 include:jsdelivr
 include:line
@ -22,6 +36,7 @@ include:linkedin
 include:microsoft
 include:mozilla
 include:netflix
+include:ntd
 include:nytimes
 include:oracle
 include:pinterest
@ -31,14 +46,20 @@ include:python
 include:quora
 include:rarbg
 include:reddit
+include:reuters
 include:rfa
+include:rfi
+include:rsf
+include:scmp
 include:soundcloud
 include:startpage
 include:steam
+include:steemit
 include:stackexchange
 include:taboola
 include:ted
 include:telegram
+include:tsquare
 include:tumblr
 include:twitter
 include:uber
@ -47,9 +68,12 @@ include:ubuntu
 include:v2ray
 include:vimeo
 include:voanews
+include:washingtonpost
 include:wikileaks
 include:wikimedia
+include:windy
 include:xda
 include:xposed
 include:yahoo
 include:yandex
+include:medium
--- a/data/geolocation-cn
+++ b/data/geolocation-cn
@ -179,7 +179,6 @@ geetest.com
 geilicdn.com
 getui.com
 gitee.com
-google-analytics.com
 growingio.com
 gtags.net
 gwdang.com
--- a/data/gfw
+++ b/data/gfw
@ -0,0 +1 @@
+gfw.press
--- a/data/gitlab
+++ b/data/gitlab
@ -1,2 +1,3 @@
 gitlab.com
+gitlab.net
 gitlab-static.net
--- a/data/globalvoices
+++ b/data/globalvoices
@ -0,0 +1,2 @@
+globalvoices.org
+globalvoicesonline.org
--- a/data/google
+++ b/data/google
@ -200,7 +200,7 @@ google
 goog

 # Others
-admob.com
+admob.com @ads
 adsense.com
 adwords.com
 abc.xyz
@ -213,13 +213,15 @@ chrome.com
 chromebook.com
 cobrasearch.com
 feedburner.com
-doubleclick.com
+doubleclick.com @ads
+doubleclick.net @ads
 igoogle.com
 foofle.com
 froogle.com
-googleanalytics.com
-google-analytics.com
-googletagmanager.com
+googleanalytics.com @ads
+google-analytics.com @ads
+googletagmanager.com @ads
+googletagservices.com @ads
 googlecode.com
 googlesource.com
 googledrive.com
@ -251,14 +253,14 @@ googil.com
 googlr.com
 googl.com
 gmodules.com
-googleadservices.com
+googleadservices.com @ads
 googleapps.com
 googleapis.com
 googleapis.cn
 goo.gl
 googlebot.com
 googlecommerce.com
-googlesyndication.com
+googlesyndication.com @ads
 g.co
 whatbrowser.org
 withgoogle.com
@ -273,6 +275,7 @@ gstatic.com
 amp.dev
 ampproject.org
 autodraw.com
+blogblog.com
 certificate-transparency.org
 dart.dev
 dartlang.org
@ -290,4 +293,3 @@ webmproject.org
 webrtc.org

 include:youtube
-include:google-ads
--- a/data/greatfire
+++ b/data/greatfire
@ -0,0 +1 @@
+greatfire.org
--- a/data/guo
+++ b/data/guo
@ -0,0 +1 @@
+guo.media
--- a/data/hk01
+++ b/data/hk01
@ -0,0 +1 @@
+hk01.com
--- a/data/huanghuagang
+++ b/data/huanghuagang
@ -0,0 +1 @@
+huanghuagang.org
--- a/data/infrapedia
+++ b/data/infrapedia
@ -0,0 +1 @@
+infrapedia.com
--- a/data/medium
+++ b/data/medium
@ -0,0 +1 @@
+medium.com
--- a/data/netflix
+++ b/data/netflix
@ -1,6 +1,9 @@
+btstatic.com
 netflix.com
 netflix.net
 nflxext.com
 nflximg.com
 nflximg.net
+nflxsearch.net
+nflxso.net
 nflxvideo.net
--- a/data/ntd
+++ b/data/ntd
@ -0,0 +1,2 @@
+ntd.com
+ntdtv.com
--- a/data/reuters
+++ b/data/reuters
@ -0,0 +1,2 @@
+reuters.com
+reuters.tv
--- a/data/rfi
+++ b/data/rfi
@ -0,0 +1 @@
+rfi.fr
--- a/data/rsf
+++ b/data/rsf
@ -0,0 +1 @@
+rsf.org
--- a/data/scmp
+++ b/data/scmp
@ -0,0 +1,2 @@
+scmp.com
+i-scmp.com
--- a/data/steemit
+++ b/data/steemit
@ -0,0 +1 @@
+steemit.com
--- a/data/tsquare
+++ b/data/tsquare
@ -0,0 +1 @@
+tsquare.tv
--- a/data/vimeo
+++ b/data/vimeo
@ -1,2 +1,3 @@
 vimeo.com
 vimeocdn.com
+livestream.com
--- a/data/washingtonpost
+++ b/data/washingtonpost
@ -0,0 +1 @@
+washingtonpost.com
--- a/data/windy
+++ b/data/windy
@ -0,0 +1 @@
+windy.com
--- a/data/xiaomitv-ads
+++ b/data/xiaomitv-ads
@ -1,14 +1,12 @@
-pandora.mi.com @ads
 ad.mi.com @ads
 ad.xiaomi.com @ads
 ad1.xiaomi.com @ads
-data.mistat.xiaomi.com @ads
+mistat.xiaomi.com @ads
 tracking.miui.com @ads
 adv.sec.miui.com @ads
 misc.in.duokanbox.com @ads
 ad.hpplay.cn @ads
 adeng.hpplay.cn @ads
-auth.api.gitv.tv @ads
 atianqi.com @ads
 kuyun.com @ads
 umeng.com @ads