aboutsummaryrefslogtreecommitdiffstats
path: root/assets
diff options
context:
space:
mode:
authorgorhill <rhill@raymondhill.net>2014-10-25 10:19:47 -0400
committergorhill <rhill@raymondhill.net>2014-10-25 10:19:47 -0400
commit042e87b6ae8dad02a1fc1687357b061587fa5e02 (patch)
treec5b9c3ae8a8ef7f344b2da4e00bf2e88695def4e /assets
parent06bb797d50e39b57e749e9b2f0274db3aa137cd9 (diff)
downloaduBlock-042e87b6ae8dad02a1fc1687357b061587fa5e02.zip
uBlock-042e87b6ae8dad02a1fc1687357b061587fa5e02.tar.gz
uBlock-042e87b6ae8dad02a1fc1687357b061587fa5e02.tar.bz2
removed custom fixes to EasyPrivacy
Diffstat (limited to 'assets')
-rw-r--r--assets/checksums.txt2
-rw-r--r--assets/ublock/filters.txt17
2 files changed, 2 insertions, 17 deletions
diff --git a/assets/checksums.txt b/assets/checksums.txt
index b6ab5d8..15a8f02 100644
--- a/assets/checksums.txt
+++ b/assets/checksums.txt
@@ -1,6 +1,6 @@
39c6f45e6a3d4ec664d24fa9cc5869dc assets/ublock/thirdparty-lists.txt
6572a7bce5f1747fee597cb170bd3b98 assets/ublock/privacy.txt
-c288d36ac631a93229466a55ca42579f assets/ublock/filters.txt
+cedc229d54c513bf41cd0b68c3d9631b assets/ublock/filters.txt
d68d11d1e4c54022fa8582662c2589b0 assets/ublock/mirror-candidates.txt
0184aa4f511a114e2c5b479639b6b49c assets/ublock/filter-lists.json
132b3ecc9da8a68c3faf740c00af734b assets/thirdparties/adblock-plus-japanese-filter.googlecode.com/hg/abp_jp.txt
diff --git a/assets/ublock/filters.txt b/assets/ublock/filters.txt
index 46d5a28..e353cd8 100644
--- a/assets/ublock/filters.txt
+++ b/assets/ublock/filters.txt
@@ -123,18 +123,7 @@ google.*###center_col > #tads
@@||cdn-i.dmdentertainment.com^$domain=cracked.com
# EasyList/EasyPrivacy fixes
-# https://github.com/gorhill/uBlock/issues/328#issuecomment-59572907
-# To counter EasyList's "||imasdk.googleapis.com^$third-party"
-@@||el-mundo.net^$domain=www.tiramillas.net
-@@||webspectator.com^$domain=www.tiramillas.net
-
-@@||imasdk.googleapis.com^$domain=live.geo.tv
-# To counter EasyPrivacy's "/fingerprint.js"
-@@||live.seenreport.com^*/fingerprint.js
-# To counter EasyList's "||imasdk.googleapis.com^$third-party"
-@@||imasdk.googleapis.com^$domain=live.express.pk
-# To counter EasyPrivacy's "/ping.gif?"
-@@||i.n.jwpltx.com/v1/jwplayer6/ping.gif?$domain=live.express.pk
+# None!
# To counter `adm.fwmrm.net` from hpHosts, MVPS, Dan Pollock's
@@||adm.fwmrm.net^$domain=go.com
@@ -162,7 +151,3 @@ google.*###center_col > #tads
# https://github.com/gorhill/uBlock/issues/336
# To counter `flurry.com` in Peter Lowe's, hpHosts, MVPS
@@||flurry.com^$~third-party
-
-# Chrome store feedback
-# To counter `scorecardresearch.com` in Peter's Lowe, hpHosts, Dan Pollock's, MVPS
-@@||scorecardresearch.com^$domain=www.tiramillas.net