Merge branch 'master' into tmp

data/adobe

@@ -1,5 +1,11 @@
 adobe.com
-omtrdc.net
+adobe.io
-typekit.com
+adobeccstatic.com
-adobelogin.com
+adobedc.net
 adobedtm.com
+adobelogin.com
+adobeoobe.com
+behance.net
+omtrdc.net
+
+include:typekit

data/amazon

@@ -1,7 +1,6 @@
 amazon.com
 ssl-images-amazon.com
 media-amazon.com
-amazon-adsystem.com
 amazon.co.uk
 amazon.co.jp
 amazon.jp
@@ -13,3 +12,5 @@ cloudfront.net
 
 # All .aws domains
 aws
+
+include:amazon-ads

data/amazon-ads

@@ -0,0 +1 @@
+amazon-adsystem.com @ads

data/category-ads

@@ -3,6 +3,7 @@
 include:acfun-ads
 include:alibaba-ads
 include:apple-ads
+include:amazon-ads
 include:baidu-ads
 include:dmm-ads
 include:google-ads
@@ -14,11 +15,14 @@ include:letv-ads
 include:mxplayer-ads
 include:netease-ads
 include:ookla-speedtest-ads
+include:pubmatic-ads
 include:sina-ads
 include:sohu-ads
 include:tappx-ads
+include:tencent-ads
 include:umeng-ads
 include:xiaomitv-ads
+include:yahoo-ads
 include:youku-ads
 include:yyets-ads
 
@@ -30,6 +34,8 @@ ad.api.moji.com
 ad.wang502.com
 adbutter.net
 ads.trafficjunky.net
+adtechus.com
+aaxads.com
 cfts1tifqr.com
 contentabc.com
 img-bss.csdn.net

data/dropbox

@@ -1,18 +1,18 @@
 # List of all domains being operated by Dorpbox Inc.
 
-# Source: https://www.dropbox.com/en/help/security/official-domains
+# Source: https://help.dropbox.com/zh-cn/accounts-billing/security/official-domains
 db.tt
+dropbox-dns.com
 dropbox.com
+dropbox.zendesk.com
 dropboxapi.com
-dropboxusercontent.com
 dropboxbusiness.com
-dropboxforums.com
+dropboxcaptcha.com
 dropboxforum.com
+dropboxforums.com
 dropboxinsiders.com
 dropboxmail.com
 dropboxpartners.com
 dropboxstatic.com
-dropbox.zendesk.com
+dropboxusercontent.com
 getdropbox.com
-paper.dropbox.com
-dropbox-dns.com

data/geolocation-!cn

@@ -88,6 +88,7 @@ include:duckduckgo
 include:faststone
 include:gofundme
 include:gravatar
+include:imgur
 include:infrapedia
 include:netlify
 include:pinterest
@@ -120,6 +121,7 @@ include:vimeo
 include:yyets
 
 # Forums
+include:lihkg
 include:pincong
 include:quora
 include:reddit
@@ -147,6 +149,7 @@ include:reuters
 include:rfa
 include:rfi
 include:rsf
+include:rthk
 include:scmp
 include:sinoinsider
 include:soundofhope

data/google

@@ -272,6 +272,7 @@ chromebook.com
 cobrasearch.com
 feedburner.com
 igoogle.com
+firebaseapp.com
 foofle.com
 froogle.com
 googlecode.com
@@ -286,6 +287,7 @@ gmail.com
 googlemail.com
 keyhole.com
 madewithcode.com
+page.link
 panoramio.com
 picasa.com
 urchin.com

data/imgur

@@ -0,0 +1,2 @@
+imgur.com
+imgurinc.com

data/lihkg

@@ -0,0 +1,2 @@
+lih.kg
+lihkg.com

data/metart

@@ -1,3 +1,5 @@
 metart.com
 metartnetwork.com
+metcams.com
+naiadsystems.com
 nsimg.net

data/pigav

@@ -1,2 +1 @@
 pigav.com
-jwpcdn.com

data/pornhub

@@ -1,4 +1,3 @@
+phncdn.com
 pornhub.com
 pornhubpremium.com
-
-phncdn.com

data/pubmatic

@@ -0,0 +1,6 @@
+# Programmatic Digital Advertising Technology & Solutions | PubMatic
+
+pubmatic.com
+pubmatic.co.jp
+
+include:pubmatic-ads

data/pubmatic-ads

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

data/rthk

@@ -0,0 +1,2 @@
+etvonline.hk
+rthk.hk

data/stackexchange

@@ -1,9 +1,19 @@
-# Reference: 'https://stackexchange.com/sites'
+# References:
-stackexchange.com
+# https://stackexchange.com/sites
-stackoverflow.com
+# https://meta.stackexchange.com/questions/81379/can-we-have-a-list-of-all-the-stack-exchange-domains-somewhere-for-firewall-pur
-serverfault.com
+
 askubuntu.com
-superuser.com
+blogoverflow.com
-stackapps.com
 mathoverflow.net
+serverfault.com
 sstatic.net
+stackapps.com
+stackexchange.com
+stackmod.blog
+stackoverflow.blog
+stackoverflow.com
+stackoverflowbusiness.com
+stacksnippets.net
+superuser.com
+tex-talk.net
+thesffblog.com

data/tencent

@@ -22,4 +22,6 @@ servicewechat.com
 wegame.com
 weiyun.com
 tenpay.com
-qlogo.cn
+qlogo.cn
+
+include:tencent-ads

data/tencent-ads

@@ -0,0 +1,21 @@
+ad.qq.com @ads
+ad.qun.qq.com @ads
+adfilter.imtt.qq.com @ads
+adping.qq.com @ads
+adpm.app.qq.com @ads
+adsclick.qq.com @ads
+adsfile.qq.com @ads
+adshmmsg.qq.com @ads
+adslvfile.qq.com @ads
+adslvseed.qq.com @ads
+adsmind.apdcdn.tc.qq.com @ads
+adsqqclick.qq.com @ads
+adstestview.qq.com @ads
+adsview.qq.com @ads
+adsview2.qq.com @ads
+adv.app.qq.com @ads
+adver.qq.com @ads
+e.qq.com @ads
+log.tbs.qq.com @ads
+mpush.qq.com @ads
+push.qq.com @ads

data/typekit

@@ -0,0 +1,2 @@
+typekit.com
+typekit.net

data/yahoo

@@ -146,3 +146,5 @@ yimg.com
 # Reference: https://data.iana.org/TLD/tlds-alpha-by-domain.txt
 # All .yahoo domains
 yahoo
+
+include:yahoo-ads

data/yahoo-ads

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