Merge branch 'master' of https://github.com/privacy-protection-tools/anti-AD

# Conflicts:
#	adblock-for-dnsmasq.conf
#	anti-ad-domains.txt
#	anti-ad-easylist.txt
#	anti-ad-smartdns.conf
#	anti-ad-surge.txt
#	anti-ad-surge2.txt
#	scripts/lib/white_domain_list.php

scripts/lib/white_domain_list.php

@@ -170,6 +170,13 @@ return array(
     'sf3-ttcdn-tos.pstatp.com' => 0, // #258
     'upload.cc' => 0, // #262
     'yql.yahoo.com' => 0, // #263
+    'naifei.shop' => 0, // #267
+    'tagtic.cn' => 0, // #266
+    'settings-win.data.microsoft.com' => 0, // #268
+    'db5-eap.settings-win.data.microsoft.com.akadns.net' => 0, // #268
+    'db5.settings-win.data.microsoft.com.akadns.net' => 0, // #268
+    'geo.settings-win.data.microsoft.com.akadns.net' => 0, // #268
+    'printfriendly.com' => 0, // #272
     'cnnic.cn' => 0, #274
     'ss.cnnic.cn' => 0, #274
     'www.cnnic.cn' => 0, #274

scripts/origin-files/easylist3.txt

@@ -1,7 +1,7 @@
 [Adblock Plus 1.1]
-! Version: 202010280131
+! Version: 202010312351
 ! Title: EasyPrivacy
-! Last modified: 28 Oct 2020 01:31 UTC
+! Last modified: 31 Oct 2020 23:51 UTC
 ! Expires: 4 days (update frequency)
 ! Homepage: https://easylist.to/
 ! Licence: https://easylist.to/pages/licence.html
@@ -1280,6 +1280,7 @@
 /clickstats.
 /clickstream.aspx?
 /clickstream.js
+/clickstream/visit?
 /clicktag.
 /ClickTail.
 /clicktale-
@@ -7158,6 +7159,7 @@ _mongo_stats/
 ||nakanohito.jp^$third-party
 ||nalook.com^$third-party
 ||nanovisor.io^$third-party
+||narrativ.com^$third-party
 ||natero.com^$third-party
 ||native.ai^$third-party
 ||natpal.com^$third-party
@@ -10035,6 +10037,7 @@ _mongo_stats/
 ||amazonaws.com/prod/entities
 ||amazonaws.com/prod/main?ref=$image,third-party
 ||amazonaws.com/prod/report-only
+||amazonaws.com/prod/v2
 ||amazonaws.com/production_beacon
 ||amazonaws.com/searchdiscovery-satellite-production/
 ||amazonaws.com/statics.reedge.com/
@@ -10456,7 +10459,6 @@ _mongo_stats/
 ||collector.mazeberry.com^
 ||collector.roistat.com^
 ||collector.sspinc.io^
-||comet.ibsrv.net^
 ||comic-rocket.com/metrics.js
 ||comms.thewhiskyexchange.com^$image
 ||communicatorcorp.com^*/conversiontracking.js
@@ -10600,6 +10602,7 @@ _mongo_stats/
 ||d3iouejux1os58.cloudfront.net^
 ||d3kyk5bao1crtw.cloudfront.net^
 ||d3l3lkinz3f56t.cloudfront.net^
+||d3m6sept6cnil5.cloudfront.net^
 ||d3mskfhorhi2fb.cloudfront.net^
 ||d3n6i6eorggdxk.cloudfront.net^
 ||d3q7vxy7usqoub.cloudfront.net^
@@ -10672,6 +10675,7 @@ _mongo_stats/
 ||dn34cbtcv9mef.cloudfront.net^
 ||dnn506yrbagrg.cloudfront.net^
 ||domodomain.com^*/ddsense.aspx?
+||dotaudiences.com^$third-party
 ||doug1izaerwt3.cloudfront.net^
 ||dreamhost.com/*.cgi?$image,third-party
 ||drift.com/impressions/
@@ -11099,7 +11103,7 @@ _mongo_stats/
 ||loglady.skypicker.com^
 ||logs-api.shoprunner.com^
 ||logs.datadoghq.com^$domain=~app.datadoghq.com
-||logs.datadoghq.eu^
+||logs.datadoghq.eu^$domain=~app.datadoghq.eu
 ||logs.spilgames.com^
 ||logs.thebloggernetwork.com^
 ||logs.vmixcore.com^
@@ -11216,6 +11220,7 @@ _mongo_stats/
 ||musvc2.net/e/c?
 ||mutinyhq.com/impressions/
 ||mv.treehousei.com^
+||mx.technolutions.net^
 ||mxmfb.com/rsps/img/
 ||myblueday.com^*/count.asp?
 ||myfreecams.com/mfc2/lib/o-mfccore.js
@@ -11435,10 +11440,12 @@ _mongo_stats/
 ||quisma.com/tracking/
 ||quora.com/_/ad/
 ||quora.com/qevents.js
+||qzzr.com/_uid.gif
 ||r.mail.ru^
 ||r.msn.com^
 ||r.ypcdn.com^*/rtd?ptid$image
 ||rackcdn.com/easie.js
+||rackcdn.com/gate.js
 ||rackcdn.com/icon2.gif?
 ||rackcdn.com/knotice.api.js
 ||rackcdn.com/stf.js
@@ -11644,6 +11651,7 @@ _mongo_stats/
 ||stats.twistage.com^
 ||stats.varrando.com^
 ||stats.viddler.com^
+||stats.vliplatform.com^
 ||stats.webs.com^
 ||stats.webstarts.com^$third-party
 ||stats.wp.com^
@@ -12086,6 +12094,7 @@ _mongo_stats/
 ||zengenti.com/tags/
 ||ziffdavisb2b.com^*/tracker.js
 ||ziffprod.com^*/zdcse.min.js?referrer=
+||zineone.com^*/event
 ||zmags.com/a/p/p.js
 ||zoover.co.uk/tracking/
 ||zope.net^*/ghs_wa.js
@@ -12948,6 +12957,7 @@ _mongo_stats/
 ||reachandrich.antevenio.com^
 ||s3wfg.com/js/vortexloader.js
 ||stats.miarroba.info^
+||stats.sec.telefonica.com^
 ||tag.shopping-feed.com^
 ||tracker.thinkindot.com^
 ! Swedish
@@ -13313,6 +13323,7 @@ _mongo_stats/
 ||canoe.ca/generix/ga.js
 ||canstockphoto.com/monitor/
 ||capitalone.com/collector/
+||capture.crutchfield.com^
 ||cardomain.com/js/tibbylog.js?
 ||cardstore.com/affiliate.jsp?
 ||carmagazine.co.uk^*/tracking.js
@@ -13851,6 +13862,7 @@ _mongo_stats/
 ||groupon.*/tracky$xmlhttprequest
 ||groupon.com/analytic/
 ||groupon.com/tracking
+||groupondata.com/tracky
 ||guardianapps.co.uk/geolocation
 ||gumtree.com.au/?pc=
 ||h.cliphunter.com^
@@ -13901,12 +13913,6 @@ _mongo_stats/
 ||hsn.com/code/pix.aspx
 ||huawei.com/hwa-c/
 ||hubpages.com/c/*.gif?
-||huffingtonpost.*/vanity/?
-||huffingtonpost.com/click?
-||huffingtonpost.com/geopromo/
-||huffingtonpost.com/include/geopromo.php
-||huffingtonpost.com/ping?
-||huffingtonpost.com/traffic/
 ||huffpost.com/ping?
 ||hulkshare.com/ajax/tracker.php
 ||hulkshare.com/stats.php
@@ -14053,8 +14059,7 @@ _mongo_stats/
 ||klout.com/ka.js
 ||knoxnews.com/metrics/
 ||kodakgallery.com^*/analytics_
-||kohls.com/_bm/_data
-||kohls.com/test_rum?
+||kohls.com/test_rum_nv?
 ||kosmix.com^*.txt?pvid=
 ||krakenlyrics.com/view?
 ||laas.americanexpress.com^
@@ -16014,7 +16019,7 @@ _mongo_stats/
 /^https?:\/\/.*\.corsair\.(fr|ci|ca|gp|mq|re)\/[a-z0-9]{19,}\?/$script,xmlhttprequest
 ||aerlingus.com/ahktqsewxjhguuxe.js
 ||aerlingus.com/ahktqsewxjhguuxexhr.js
-||bhphotovideo.com/YAEMJLYP/
+||bhphotovideo.com/otohphnbwww-
 ||greenmangaming.com/omnopfddrdlevbbh.js
 ||gumtree.com/ycxwzbcsxennhrkc.js
 ||gumtree.com/ycxwzbcsxennhrkcxhr.js
@@ -17362,7 +17367,7 @@ $csp=worker-src 'none',domain=alltube.pl|alltube.tv|animeteatr.ru|annuaire-bleu.
 @@||bookmate.com^*/impressions?$xmlhttprequest
 @@||bootcamp.mit.edu/js/angulartics-google-analytics.min.js
 @@||boxberry.ru/local/templates/site-boxberry/js/tracking_service.js$xmlhttprequest
-@@||browser.sentry-cdn.com^$domain=cardiffmedia.co.uk|imperial.ac.uk|loveotv.com|theangryviking1776.com|washingtonpost.com|wix.com
+@@||browser.sentry-cdn.com^$domain=cardiffmedia.co.uk|imperial.ac.uk|loveotv.com|onginnovations.com|theangryviking1776.com|thepittsburghoratory.org|washingtonpost.com|wix.com
 @@||bugzilla.mozilla.org^*/extensions/TrackingFlags/$script
 @@||c.paypal.com/da/r/fb.js$script
 @@||c212.net^$image,domain=prnewswire.com
@@ -17379,6 +17384,7 @@ $csp=worker-src 'none',domain=alltube.pl|alltube.tv|animeteatr.ru|annuaire-bleu.
 @@||cdn.privacy-mgmt.com^$domain=telegraph.co.uk
 @@||certona.net^*/scripts/resonance.js$script,domain=canadiantire.ca
 @@||changenow.io/js/tracking.js$script
+@@||chasecdn.com^*/@ccb-blueanalytics/$script,domain=chase.com
 @@||check.ddos-guard.net/check.js$script
 @@||chessfriends.com/js/live/GoogleAnalytics.js?$~third-party
 @@||circuitv.com/assets/js/analytics.js$~third-party
@@ -17426,8 +17432,8 @@ $csp=worker-src 'none',domain=alltube.pl|alltube.tv|animeteatr.ru|annuaire-bleu.
 @@||dpm.demdex.net/id?$xmlhttprequest,domain=foxnews.com
 @@||dw.cbsi.com/anonc.js$domain=gamespot.com|giantbomb.com
 @@||dw.com.com/js/dw.js$domain=cbsnews.com|gamespot.com|tv.com
-@@||dynamicyield.com/api/$script,domain=flytap.com|thewarehouse.co.nz|zalora.com.my|zalora.com.ph|zalora.sg
-@@||dynamicyield.com/st?$script,domain=computeruniverse.net|zalora.com.my|zalora.com.ph|zalora.sg
+@@||dynamicyield.com/api/$script,domain=fendi.com|flytap.com|thewarehouse.co.nz|zalora.com.my|zalora.com.ph|zalora.sg
+@@||dynamicyield.com/st?$script,domain=computeruniverse.net|fendi.com|zalora.com.my|zalora.com.ph|zalora.sg
 @@||e2e-comms.pearson.com/osbrowserchecker/prd/thirdPartyCookie.html?$subdocument,domain=pearsonmylabandmastering.com
 @@||easyship.com/api/v1/track/$xmlhttprequest,domain=trackmyshipment.co
 @@||eatstreet.com/api/v2/tracking/$~third-party
@@ -17619,7 +17625,7 @@ $csp=worker-src 'none',domain=alltube.pl|alltube.tv|animeteatr.ru|annuaire-bleu.
 @@||s.yimg.com^*/advertisement/sponsor/promo/ad.png$image,domain=news.yahoo.com
 @@||sahibinden.com/assets/analytics*.js$script
 @@||sbphototours.com/includes/AWStats.js$~third-party
-@@||scorecardresearch.com/beacon.js$domain=agame.com|allmusic.com|amctv.com|apl.tv|babycenter.com|bonappetit.com|calgaryherald.com|canada.com|cbc.ca|dailymail.co.uk|dailymotion.com|deviantart.com|discovery.com|doctoroz.com|edmontonjournal.com|fastcompany.com|financialpost.com|firstwefeast.com|hitfix.com|huffingtonpost.com|investigationdiscovery.com|landandfarm.com|last.fm|leaderpost.com|m.tmz.com|montrealgazette.com|nationalpost.com|newsday.com|ottawacitizen.com|outsideonline.com|radaronline.com|salon.com|sci2.tv|syfy.com|theprovince.com|thestar.com|thestarphoenix.com|thinkatheist.com|tlc.com|tmz.com|v3.co.uk|vancouversun.com|windsorstar.com
+@@||scorecardresearch.com/beacon.js$domain=agame.com|allmusic.com|amctv.com|apl.tv|babycenter.com|bonappetit.com|calgaryherald.com|canada.com|cbc.ca|dailymail.co.uk|dailymotion.com|deviantart.com|discovery.com|doctoroz.com|edmontonjournal.com|fastcompany.com|financialpost.com|firstwefeast.com|hitfix.com|investigationdiscovery.com|landandfarm.com|last.fm|leaderpost.com|m.tmz.com|montrealgazette.com|nationalpost.com|newsday.com|ottawacitizen.com|outsideonline.com|radaronline.com|salon.com|sci2.tv|syfy.com|theprovince.com|thestar.com|thestarphoenix.com|thinkatheist.com|tlc.com|tmz.com|v3.co.uk|vancouversun.com|windsorstar.com
 @@||scorecardresearch.com/c2/plugins/streamsense_plugin_html5.js
 @@||scorecardresearch.com/c2/plugins/streamsense_plugin_theplatform.js
 @@||screen9.com/players/*/amber-google-analytics.esm.js$script,domain=api.screen9.com

scripts/origin-files/easylist4.txt

@@ -1,6 +1,15 @@
 ! Title: adgk手机去广告规则
 ! Homepage: https://adgk.net
 ! by:酷安@坂本dalao
+||maizixueyuan*/js/html*.js
+||longtenghuaxia*/js/html*.js
+||dybz*/js/html*.js
+||diyibanzhu*/js/html*.js
+||ssznrs.com^
+||kubam.cn^
+||ee035.cn^
+||newqiyu.com/*/ads^
+||beiwaicd.com^
 lzdcctv.cn$$div[class="ac_pc"]
 lzdcctv.cn$$div[class="slinks"]
 ||huigun.top^
@@ -52,13 +61,9 @@ bde4.com$$script[tag-content="yabo"]
 ||ku6.com^
 ||pimlog.baidu.com^
 ||track.readdsp.com^
-/js/htmlkcc.js
 /js/qiguo.js
-/js/htmlkc.js
-/js/htmlka.js
 /js/xxchapter.js
 ||longtan.in^
-/js/htmlks.js
 ||aliyune.xyz^
 ||cstm.baidu.com^
 ||baidu.com/tc?
@@ -7169,7 +7174,6 @@ mbd.baidu.com##.commonPadding
 gitee.com##IMG[class='float-people']
 ||images.gitee.com/uploads^
 ||m.diyibanzhu.life/js/wap.js
-||m.diyibanzhu.life/js/htmlk1.js
 www.rmdown.com##a[href^="\*alicdn.com/"]
 ||d.fjqinan.com/app/semob5.16.12_161250_R19355_121098028_build58080_2.1.0.2367.apk
 ||o.a0shop.top^
@@ -9383,9 +9387,6 @@ wuhaozhan.net$$div[class="item-box"]
 ||huoyiad1.cn^
 ||huoyiad2.cn^
 ||liufenghua.com^
-/js/htmlkb.js
-/js/htmlka.js
-/js/htmlkc.js
 /js/xxchapter.js
 ||adgomob.com^
 ||lcvfar.com^

scripts/origin-files/whiterule-src-easylist.txt

@@ -229,7 +229,6 @@
 @@||hh010.com^$generichide
 @@||history.com^$generichide
 @@||huffingtonpost.co.uk^$generichide
-@@||huffingtonpost.com^$generichide
 @@||ibf.tw^$generichide
 @@||ifttt.com^$generichide
 @@||image.coolapk.com^