Merge branch 'upstream'

3 files changed, 68 insertions, 9 deletions

diff --git a/assets/checksums.txt b/assets/checksums.txt
index 74b777a..fb5fbf6 100644
--- a/assets/checksums.txt
+++ b/assets/checksums.txt
@@ -1,6 +1,6 @@
-6f506c670bd425f4743c3056d5a51d83 assets/ublock/unbreak.txt
+7e679d07b2350b215a5f01456e84fe73 assets/ublock/unbreak.txt
 75448208315e80706632ec8a6df0e6d3 assets/ublock/privacy.txt
-1fcf43b9a244944394d30421e60fda83 assets/ublock/filters.txt
+fa30a140569cca02898fa2e1114d6143 assets/ublock/filters.txt
 d2c1dc3f8c4528e6d6a9083afc30b938 assets/ublock/badware.txt
 c9c5cc56bec563bc1885847f925b9be2 assets/ublock/mirror-candidates.txt
 d6649cbd5533bb5ea3ccd8de060d21fe assets/ublock/filter-lists.json
diff --git a/assets/ublock/filters.txt b/assets/ublock/filters.txt
index 35578b5..e0099f7 100644
--- a/assets/ublock/filters.txt
+++ b/assets/ublock/filters.txt
@@ -9,8 +9,10 @@ www.zerohedge.com##.similar-box
 # entity = domain minus public suffix
 # The following filters were taken out of EasyList and given an entity name,
 # which makes them candidates to be injected early in the page.
-# Last updated: 2015-01-27
+# Last updated: 2015-10-15
 google.*###center_col > #\5f Emc
+google.*###center_col > #main > .dfrd > .mnr-c > .c._oc._zs
+google.*###center_col > #res > #topstuff + #search > div > #ires > #rso > #flun
 google.*###center_col > #resultStats + #tads
 google.*###center_col > #resultStats + #tads + #res + #tads
 google.*###center_col > #resultStats + div + #res + #tads
@@ -18,14 +20,19 @@ google.*###center_col > #resultStats + div[style="border:1px solid #dedede;margi
 google.*###center_col > #taw > #tvcap > .rscontainer
 google.*###center_col > div[style="font-size:14px;margin-right:0;min-height:5px"] > div[style="font-size:14px;margin:0 4px;padding:1px 5px;background:#fff8e7"]
 google.*###cnt #center_col > #res > #topstuff > .ts
+google.*###cnt #center_col > #taw > #tvcap > .c._oc._Lp
 google.*###main_col > #center_col div[style="font-size:14px;margin:0 4px;padding:1px 5px;background:#fff7ed"]
 google.*###mbEnd[cellspacing="0"][cellpadding="0"]
 google.*###mclip_container:last-child
 google.*###mn #center_col > div > h2.spon:first-child
 google.*###mn #center_col > div > h2.spon:first-child + ol:last-child
+google.*###mn div[style="position:relative"] > #center_col > ._Ak
+google.*###mn div[style="position:relative"] > #center_col > div > ._dPg
 google.*###resultspanel > #topads
 google.*###rhs_block > #mbEnd
 google.*###rhs_block > .ts[cellspacing="0"][cellpadding="0"][style="padding:0"]
+google.*###rhs_block > ol > .rhsvw > .kp-blk > .xpdopen > ._OKe > ol > ._DJe > .luhb-div
+google.*###rhs_block > script + .c._oc._Ve.rhsvw
 google.*###rhswrapper > #rhssection[border="0"][bgcolor="#ffffff"]
 google.*###ssmiwdiv[jsdisplay]
 google.*###tads + div + .c
@@ -43,6 +50,7 @@ google.*##.GPMV2XEDA2 > .GPMV2XEDP1 > .GPMV2XEDJBB
 google.*##.ch[onclick="ga(this,event)"]
 google.*##.commercial-unit-desktop-rhs
 google.*##.commercial-unit-desktop-top
+google.*##.commercial-unit-mobile-top
 google.*##.lads[width="100%"][style="background:#FFF8DD"]
 google.*##.mod > ._jH + .rscontainer
 google.*##.mw > #rcnt > #center_col > #taw > #tvcap > .c
@@ -117,11 +125,42 @@ speedtest.net###swiffycontainer canvas
 # https://github.com/gorhill/uBlock/issues/651
 ink361.com##.getridofAdsBlock[href^="javascript:"]
 
-# washingtonpost.com
-||js.washingtonpost.com/wpost2/js/combo$script,first-party
-www.washingtonpost.com###drawbridge-signup-overlay
-www.washingtonpost.com##.jqmOverlay
-
 # https://www.reddit.com/r/techsupport/comments/3kyd0m/sponsored_content_ads_that_only_show_up_with/
 explosm.net##.inner-wrap > .row > .columns.large-4.medium-12.small-12
 explosm.net##.inner-wrap > .row > .columns.large-8.medium-12 > hr + div:not(.row)
+
+# http://www.extremetech.com/mobile/214358-ad-blocking-for-the-masses-part-two-adblock-browser
+# "anyone else trying it on ET find that one ziffdavis.com ad bypasses ublock0 even though it's in the default lists for block"
+||inspiringsweater.xyz^
+||deservedlimp.xyz^
+
+# https://www.reddit.com/r/facebook/comments/3ld5gn/ive_discovered_that_i_cant_access_facebook/
+# Until all users have latest EasyList
+@@RPNcr3s-aD2.js$script,domain=facebook.com
+
+# https://github.com/gorhill/uBlock/issues/275
+jeu.info###page [class^="banniere-"]
+||jeu.info^$inline-script
+
+# https://github.com/gorhill/uBlock/issues/759
+# Until fixed in EasyPrivacy
+@@||eplayerhtml5.performgroup.com/js/tsEplayerHtml5/js/Eplayer/js/quantcast/quant.js$script,first-party
+@@||eplayerhtml5.performgroup.com/js/tsEplayerHtml5/js/Eplayer/js/quantcast/vquant.js$script,first-party
+
+# http://arstechnica.com/civis/viewtopic.php?f=3&t=1296357
+arstechnica.com###lg-pushdown
+
+# This prevents spurious redirection, but breaks comments
+||js.washingtonpost.com/wpost/js/combo?*/util/util.identity-management-1.1.0.js$script,first-party
+
+# Useful inline script tag filters until filter list maintainers start to use
+# it in their respective filter lists
+arstechnica.com##script:contains(ars.READY.push)
+auto-motor-und-sport.de,boerse-online.de,echo-online.de,fem.com,finanzen.net,focus.de,gamestar.de,kabeleins.de,pcwelt.de,prosieben.de,prosiebenmaxx.de,rp-online.de,sat1.de,sat1gold.de,sixx.de,the-voice-of-germany.de,tvspielfilm.de,wetter.com,wetteronline.de##script:contains(uabInject)
+bild.de##script:contains(/^\s*de.bild.cmsKonfig/)
+bild.de##script:contains(Javascript)
+dayt.se##script:contains(adblock.php)
+dpstream.net,jeux-porno.net##script:contains(/^\s*?var\s+?uniqueParam\s*?=/)
+explosm.net##script:contains(/^__durl=/)
+extremetube.com,gaytube.com,keezmovies.com,mofosex.com,pornhub.com,redtube.com,spankwire.com,thumbzilla.com,tube8.*,xtube.com,youporn.com,youporngay.com##script:contains(FastPopSessionRequestNumber)
+opensubtitles.org##script:contains(defaultCheckForAdBlockExistance)
diff --git a/assets/ublock/unbreak.txt b/assets/ublock/unbreak.txt
index a22a93d..e097651 100644
--- a/assets/ublock/unbreak.txt
+++ b/assets/ublock/unbreak.txt
@@ -114,8 +114,9 @@ ovh.strim.io#@##tweets
 
 # From Chrome store: "Go to site http://www.vd.nl/ ... links from dropdown top menu do not work"
 # https://github.com/gorhill/uBlock/issues/349 : "conflicting with reddit's gold popup box"
+# https://github.com/chrisaljoudi/uBlock/issues/1546
 # To counter Dan Pollock's, hpHosts, MVPS, Peter Lowe's
-@@||google-analytics.com/analytics.js$domain=reddit.com|www.vd.nl
+@@||google-analytics.com/analytics.js$domain=reddit.com|trello.com|www.vd.nl
 
 # https://github.com/chrisaljoudi/uBlock/issues/570
 # To counter `yui.yahooapis.com` in hpHosts
@@ -218,3 +219,22 @@ ovh.strim.io#@##tweets
 
 # https://forums.lanik.us/viewtopic.php?f=64&t=24764
 @@/b/ss/*&aqe=$image,domain=aeroplan.com
+
+# https://github.com/gorhill/uBlock/issues/780
+@@||www.google-analytics.com/plugins/ua/linkid.js$script,domain=support.amd.com
+@@||www.google-analytics.com/analytics.js$script,domain=support.amd.com
+@@||www.googletagmanager.com/gtm.js$script,domain=support.amd.com
+
+# https://www.reddit.com/r/uBlockOrigin/comments/3oca9w/how_to_keep_ublock_from_interfering_with_button/
+@@||partner.googleadservices.com/gpt/$script,domain=www.merriam-webster.com
+@@||www.atpworldtour.com/assets/js/util/googleAnalytics.js$script,first-party
+
+# https://twitter.com/bociusz/status/653693746626871296
+# To counter Peter Lowe's `pagefair.com`, but only when on `pagefair.com`
+@@||pagefair.com^$first-party
+
+# Chrome store: "Some of the useful content on website such as pictures and maps on redfin get blocked"
+@@||ssl.cdn-redfin.com/*/redfin/common/analytics/PixelTracking.js$script,domain=redfin.com
+
+# Chrome store: "uBlock Origin seems to think Southwest.com's background and header image are ads"
+@@||www.southwest.com/*/mbox.js$script,first-party