From 4cef551b0175f46bbee1689707e59e62bff99ed4 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Fri, 3 Aug 2018 00:09:32 +0200 Subject: [PATCH] Release 68.0.3440.87 --- CHANGELOG.md | 37 +-- filters/adblock_entries.h | 153 +++++++++++-- patches/BRM049_Bromite-adblock-engine.patch | 89 ++++---- ...M059_Add-flag-to-show-hide-NTP-tiles.patch | 14 +- ...d-flag-to-disable-custom-tab-intents.patch | 2 +- ...rt-button-to-Bookmarks-activity-page.patch | 210 ++++++++++++++++++ ...isable-fetching-of-all-field-trials.patch} | 0 ...5_Disable-smooth-scrolling-on-Linux.patch} | 0 ... BRM066_Disable-plugins-enumeration.patch} | 0 ...account-access-permission-on-reboot.patch} | 0 ...length-for-newly-generated-RSA-keys.patch} | 0 ...obes-to-RIPE-DNS-rather-than-Google.patch} | 0 ...o-not-tick-send-settings-by-default.patch} | 0 ...able-warning-about-missing-API-keys.patch} | 0 ...l-disable-autofill-download-manager.patch} | 0 ..._run-deactivate-autoupdate-globally.patch} | 0 ...browsing-disable-incident-reporting.patch} | 0 ...-reporting-of-safebrowsing-override.patch} | 0 ...rowsing-disable-cookie-transmission.patch} | 0 ...omponent-extensions-in-the-ext-list.patch} | 0 ...-of-translate-languages-from-server.patch} | 0 ...nt-suppress-hardcoded-text-warnings.patch} | 0 ...-Vision.patch => BRM080_kill-Vision.patch} | 0 ...0_kill-GCM.patch => BRM081_kill-GCM.patch} | 0 ...kill-Auth.patch => BRM082_kill-Auth.patch} | 0 ...kill-remaining-Play-Services-checks.patch} | 0 ...BRM084_kill-TOS-and-metrics-opt-out.patch} | 0 ... BRM085_kill-Translate-doesn-t-work.patch} | 0 ...lso-html-reader-for-bookmark-imports.patch | 57 +++++ 29 files changed, 457 insertions(+), 105 deletions(-) create mode 100644 patches/BRM063_Add-export-button-to-Bookmarks-activity-page.patch rename patches/{BRM063_Disable-fetching-of-all-field-trials.patch => BRM064_Disable-fetching-of-all-field-trials.patch} (100%) rename patches/{BRM064_Disable-smooth-scrolling-on-Linux.patch => BRM065_Disable-smooth-scrolling-on-Linux.patch} (100%) rename patches/{BRM065_Disable-plugins-enumeration.patch => BRM066_Disable-plugins-enumeration.patch} (100%) rename patches/{BRM066_Remove-google-account-access-permission-on-reboot.patch => BRM067_Remove-google-account-access-permission-on-reboot.patch} (100%) rename patches/{BRM067_net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch => BRM068_net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch} (100%) rename patches/{BRM068_dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather-than-Google.patch => BRM069_dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather-than-Google.patch} (100%) rename patches/{BRM069_profile-resetter-do-not-tick-send-settings-by-default.patch => BRM070_profile-resetter-do-not-tick-send-settings-by-default.patch} (100%) rename patches/{BRM070_browser-ui-disable-warning-about-missing-API-keys.patch => BRM071_browser-ui-disable-warning-about-missing-API-keys.patch} (100%) rename patches/{BRM071_autofill-disable-autofill-download-manager.patch => BRM072_autofill-disable-autofill-download-manager.patch} (100%) rename patches/{BRM072_first_run-deactivate-autoupdate-globally.patch => BRM073_first_run-deactivate-autoupdate-globally.patch} (100%) rename patches/{BRM073_safe_browsing-disable-incident-reporting.patch => BRM074_safe_browsing-disable-incident-reporting.patch} (100%) rename patches/{BRM074_safe_browsing-disable-reporting-of-safebrowsing-override.patch => BRM075_safe_browsing-disable-reporting-of-safebrowsing-override.patch} (100%) rename patches/{BRM075_safe_browsing-disable-cookie-transmission.patch => BRM076_safe_browsing-disable-cookie-transmission.patch} (100%) rename patches/{BRM076_extensions-always-show-component-extensions-in-the-ext-list.patch => BRM077_extensions-always-show-component-extensions-in-the-ext-list.patch} (100%) rename patches/{BRM077_translate-disable-fetching-of-translate-languages-from-server.patch => BRM078_translate-disable-fetching-of-translate-languages-from-server.patch} (100%) rename patches/{BRM078_lint-suppress-hardcoded-text-warnings.patch => BRM079_lint-suppress-hardcoded-text-warnings.patch} (100%) rename patches/{BRM079_kill-Vision.patch => BRM080_kill-Vision.patch} (100%) rename patches/{BRM080_kill-GCM.patch => BRM081_kill-GCM.patch} (100%) rename patches/{BRM081_kill-Auth.patch => BRM082_kill-Auth.patch} (100%) rename patches/{BRM082_kill-remaining-Play-Services-checks.patch => BRM083_kill-remaining-Play-Services-checks.patch} (100%) rename patches/{BRM083_kill-TOS-and-metrics-opt-out.patch => BRM084_kill-TOS-and-metrics-opt-out.patch} (100%) rename patches/{BRM084_kill-Translate-doesn-t-work.patch => BRM085_kill-Translate-doesn-t-work.patch} (100%) create mode 100644 patches/BRM086_Fixup-build-also-html-reader-for-bookmark-imports.patch diff --git a/CHANGELOG.md b/CHANGELOG.md index d4ce8e5f..9c13b6d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ +# 68.0.3440.87 +* add export button to Bookmarks activity page + # 68.0.3440.81 * fix issue with filters with an excluded domain option -* updated AdBlock filters # 68.0.3440.72 * fix crash during some canvas rendering (fixes https://github.com/bromite/bromite/issues/95) @@ -12,11 +14,9 @@ * disable ads metrics by default * disable all field trials (fixes https://github.com/bromite/bromite/issues/83) * re-introduced own battery API patch (fixes https://github.com/bromite/bromite/issues/80) -* updated AdBlock filters # 67.0.3396.107 * removed patch to use Android Media Player for URLs (fixes https://github.com/bromite/bromite/issues/71) -* updated AdBlock filters # 67.0.3396.101 * set home page to new tab page @@ -33,7 +33,6 @@ * safe_browsing: disable cookie transmission * extensions: always show component extensions in the ext list * translate: disable fetching of translate languages from server -* updated AdBlock filters # 67.0.3396.95 * reduce headers sent in DoH requests (fixes https://github.com/bromite/bromite/issues/70) @@ -41,11 +40,9 @@ * `CloudFlare` -> `Cloudflare` (fixes https://github.com/bromite/bromite/issues/73) * fingerprint mitigations: cover also `ConvertToArrayBufferContents` * removed redundant own patch for battery API -* updated AdBlock filters # 67.0.3396.92 * improve randomization for each retrieved Canvas data (fixes https://github.com/bromite/bromite/issues/69) -* updated AdBlock filters # 67.0.3396.88 * add flag for DNS-over-HTTPS (Google experimental DNS) (fixes https://github.com/bromite/bromite/issues/68) @@ -56,90 +53,70 @@ * use Android Media Player for URLs * add exit menu item * hide "send reports to Google" menu item -* updated AdBlock filters # 67.0.3396.82 -* updated AdBlock filters # 67.0.3396.76 -* updated AdBlock filters # 67.0.3396.72 * add global toggle for adblock engine (https://github.com/bromite/bromite/issues/53) -* updated AdBlock filters # 67.0.3396.67 -* updated AdBlock filters # 66.0.3359.202 * fix DevTools integration (https://github.com/bromite/bromite/issues/23) * allow toggling of Javascript from New Tab Page (fixes https://github.com/bromite/bromite/issues/60) -* updated AdBlock filters # 66.0.3359.200 -* updated AdBlock filters # 66.0.3359.196 -* updated AdBlock filters # 66.0.3359.188 -* updated AdBlock filters * increase max (persistent) connections per server from 6 to 15 * preliminary work for better canvas fingerprinting mitigations # 66.0.3359.161 -* updated AdBlock filters # 66.0.3359.148 * disable permanently all custom tab intents (https://github.com/bromite/bromite/issues/17) -* updated AdBlock filters * reduce randomization for client rects from 5% to 3% # 65.0.3325.230 * fixed permission to access Google account issue (https://github.com/bromite/bromite/issues/11) -* updated AdBlock filters # 65.0.3325.218 * always set WideVine version -* updated AdBlock filters # 65.0.3325.204 * add menu option to toggle global Javascript preferences setting (https://github.com/bromite/bromite/issues/37) * add fingeprinting mitigation for getClientRects, getBoundingClientRect * set audio latency to fixed number -* updated AdBlock filters # 65.0.3325.198 * re-landed support for third-party AdBlock filters * completed patches cleanup -* updated AdBlock filters # 65.0.3325.190 * block some Canvas and AudioBuffer APIs mostly used for fingerprinting (https://github.com/bromite/bromite/issues/15) -* updated AdBlock filters # 65.0.3325.176 * block plugins enumeration API * block battery API * remove device name and build id from User Agent * added Qwant search engine -* updated AdBlock filters * disable non-working 3rd-party filters support # 64.0.3282.204 * use H264 NEON optimizations also for arm64 * fix build of Stable channel -* updated AdBlock filters * started building vanilla Chromium releases as well # 64.0.3282.193 -* updated AdBlock filters * disable reporting # 64.0.3282.182 * add support for domain-based adblock filters * optimized memory allocation for filters -* updated AdBlock filters # 64.0.3282.168 * extension: allow playing youtube/vimeo videos in background (https://github.com/bromite/bromite/issues/16) @@ -156,20 +133,16 @@ * disabled plugin untraceable URLs (ungoogled-chromium) # 64.0.3282.149 -* updated AdBlock filters # 63.0.3239.150 * fixed crash when clicking on address bar lock (page info) or opening site settings (https://github.com/bromite/bromite/issues/28) * build H264 with NEON optimizations for ARMv7 -* updated AdBlock filters * more builds for arm64 architecture # 63.0.3239.144 * fixed invalid AdBlock filter rule blocking all connections (https://github.com/bromite/bromite/issues/26) -* updated AdBlock filters # 63.0.3239.129 -* updated AdBlock filters # 63.0.3239.122 * disable webRTC completely (https://github.com/bromite/bromite/issues/9) @@ -182,23 +155,19 @@ * revert /deep/ and ::shadow feature drop to attempt fixing DevTools support (https://github.com/bromite/bromite/issues/23) * remove also ads from search results * add Google search engine with English-only results, no RLZ and field trials -* updated adBlock filters * fix build of x86 version (was broken in previous version) # 63.0.3239.85 * no suggest URL for DuckDuckGo (https://github.com/bromite/bromite/issues/19) * fixed 4chan blocking rule * limit AMP links cleanup to search results only (fixes broken images/news result tabs) -* updated adBlock filters # 63.0.3239.78 * correctly set version and build numbers -* updated adBlock filters # 63.0.3239.73 # 63.0.3239.64 -* updated adblock filters * fixed an issue with incognito new tab * permanent disable for ToS/metrics and unused auto-updates check diff --git a/filters/adblock_entries.h b/filters/adblock_entries.h index e28eca5d..b55c7ad4 100644 --- a/filters/adblock_entries.h +++ b/filters/adblock_entries.h @@ -19,7 +19,7 @@ struct adblock_entry { const char **domains, **domains_skip; }; -#define ADBLOCK_ENTRY_COUNT 52475 +#define ADBLOCK_ENTRY_COUNT 52534 const char *m10030a28[] = { "/InsightTrk/", NULL }; const char *m10045299[] = { "award.sitekeuring.net^", NULL }; const char *m100458cd[] = { "eluhhfyxx.com^", NULL }; @@ -370,6 +370,7 @@ const char *m1193e1df[] = { "tfttzgnpszrcf.bid^", NULL }; const char *m1198dac0[] = { "retentionscience.com^", NULL }; const char *m119b6f4c[] = { "socialspark.com^", NULL }; const char *m119b7bad[] = { "icdirect.com^", NULL }; +const char *m119be2e [] = { "/eureka_ban/", NULL }; const char *m119c040 [] = { "pixel.vmm-satellite2.com^", NULL }; const char *m119e3b3c[] = { "_webanalytics.", NULL }; const char *m11a0e6b2[] = { "sjkcufcpgzsno.bid^", NULL }; @@ -499,6 +500,7 @@ const char *m12305dfb[] = { "/bannerdeliver.php", NULL }; const char *m1231d3e4[] = { "/rdm-ad-", NULL }; const char *m12346e65[] = { "d0eda50bf4f7d172c06.com^", NULL }; const char *m12360565[] = { "spaceprogram.com/webstats/", NULL }; +const char *m12360fb4[] = { "/click/zone?", NULL }; const char *m12374f0a[] = { "1x9h3h9v.bid^", NULL }; const char *m123759a1[] = { "hjyxnjfbrj.bid^", NULL }; const char *m1237826d[] = { "dahakbkwgvwzb.bid^", NULL }; @@ -1712,6 +1714,7 @@ const char *m18197823[] = { "fwenfotroadh.bid^", NULL }; const char *m181a81d1[] = { "/kalturaevent?", NULL }; const char *m181dfeb7[] = { "mnodkuklcw.bid^", NULL }; const char *m181f33f9[] = { "e3f21da115f179a.bid^", NULL }; +const char *m18202baf[] = { "yjijmpezje.com^", NULL }; const char *m18205a1a[] = { "gstatic.com/gadf/ga_dyn.js", NULL }; const char *m1820a68b[] = { "/woopra.js", NULL }; const char *m1821bf97[] = { "tfc.tv/Scripts/", "ads.js", NULL }; @@ -2121,6 +2124,7 @@ const char *m19fbdc6d[] = { "clear-request.com^", NULL }; const char *m19fdbb69[] = { "clubic.com/editorial/publier_count.php?", NULL }; const char *m19ffbae [] = { "pornvibe.org/sw.js", NULL }; const char *m19fff192[] = { "/showsidebar-ad-", NULL }; +const char *m1a0011ad[] = { "shopify.com/", "/page?", "&eventType=", NULL }; const char *m1a01dab1[] = { "activity.frequency.com^", NULL }; const char *m1a01fc21[] = { "/trackjs_", NULL }; const char *m1a03ee74[] = { "vcdq.com^", "^ad.html", NULL }; @@ -2458,6 +2462,7 @@ const char *m1ba71cf5[] = { "yimg.com/a/1-", NULL }; const char *m1ba739e0[] = { "cast4u.tv/adshd.php", NULL }; const char *m1ba89474[] = { ".com/ads_", NULL }; const char *m1ba8aae3[] = { "_images/ad_", NULL }; +const char *m1ba8db02[] = { "vyjwsifvybc.com^", NULL }; const char *m1ba962a2[] = { "banners.nostringsattached.com^", NULL }; const char *m1bab71d5[] = { "/markpop.js", NULL }; const char *m1bac0dbf[] = { "metrics.mozilla.com^", NULL }; @@ -3245,6 +3250,7 @@ const char *m1f38bb82[] = { "tsnkvlesphbmul.bid^", NULL }; const char *m1f38f6b7[] = { "banner.pumpkinpatchkids.com/www/delivery/", NULL }; const char *m1f3ad4c2[] = { "clockdisplaystoring.com^", NULL }; const char *m1f3b51b6[] = { "phncdn.com/cb/bundles/", NULL }; +const char *m1f3c8bbc[] = { "adligature.com^", NULL }; const char *m1f3cdbed[] = { "jctszdppy.bid^", NULL }; const char *m1f3cf038[] = { "joytocash.com^", NULL }; const char *m1f3da5a0[] = { "eroprofile.com/js/pu", ".js", NULL }; @@ -5250,6 +5256,7 @@ const char *m2883d67 [] = { "qatuwjyyc.com^", NULL }; const char *m28841074[] = { "upload", ".usersfiles.com^", NULL }; const char *m288480fa[] = { "videos.com/click?", NULL }; const char *m28864c44[] = { "mobpartner.mobi^", NULL }; +const char *m28866806[] = { "javher.com/analytics.js", NULL }; const char *m28884a0d[] = { "t.sharethis.com^", NULL }; const char *m288a6444[] = { "bw8moo40.top^", NULL }; const char *m288b26db[] = { "/track/usage.", NULL }; @@ -5370,7 +5377,6 @@ const char *m2902736c[] = { "trutv.com/includes/mods/iframes/mgid-blog.php", NUL const char *m2902a772[] = { "/ga-multidomain.", NULL }; const char *m29045317[] = { "hxtrack.com^", NULL }; const char *m29056ca3[] = { "/126_ad.", NULL }; -const char *m2905b311[] = { "shopify.com/storefront/page?", "&eventType=", NULL }; const char *m29061132[] = { "/contads.", NULL }; const char *m2906cc68[] = { "/adbytes.", NULL }; const char *m29075726[] = { "obesw.com^", NULL }; @@ -6068,6 +6074,7 @@ const char *m2c5aece6[] = { "sp.yorkdispatch.com^", NULL }; const char *m2c5bd47a[] = { "/youradhere.", NULL }; const char *m2c5dd54a[] = { ".aspx?ad=", NULL }; const char *m2c5e6db3[] = { "clrstm.com^", NULL }; +const char *m2c614c51[] = { "/tagcommander.js", NULL }; const char *m2c627dfc[] = { "a.unanimis.co.uk^", NULL }; const char *m2c629539[] = { "doubleclick.net^pfadx^mc.channelnewsasia.com^", NULL }; const char *m2c62e013[] = { "mrvzisfsrvs.bid^", NULL }; @@ -6757,6 +6764,7 @@ const char *m2f93239f[] = { "/PageStatistics/", NULL }; const char *m2f934f0b[] = { "leadbolt.net^", NULL }; const char *m2f95449d[] = { "sockshare.com^", "_728.php", NULL }; const char *m2f957fba[] = { "/tracking/adobe/", NULL }; +const char *m2f96c6b7[] = { "adbetnet.com^", NULL }; const char *m2f97b721[] = { "tritondigital.com/lt?sid", "&hasads=", NULL }; const char *m2f98a024[] = { "city1016.ae/wp-content/", "-Skin_", NULL }; const char *m2f9bd79c[] = { "rklluqchluxg.com^", NULL }; @@ -7164,6 +7172,7 @@ const char *m315f1e6b[] = { "hotkeys.com^", NULL }; const char *m315fac56[] = { "beufosew.bid^", NULL }; const char *m315fc4a [] = { "theaquarian.com^", "^banners^", NULL }; const char *m315fe692[] = { "motrixi.com^", NULL }; +const char *m31604763[] = { "berush.com^", NULL }; const char *m3160dd8c[] = { "tenmax.io^", NULL }; const char *m31619302[] = { "/analytics/tms_", NULL }; const char *m3161d9db[] = { "motorhomefacts.com/images/banners/", NULL }; @@ -7511,6 +7520,7 @@ const char *m32f48065[] = { "thejointblog.com^", "^dablab.gif", NULL }; const char *m32f7d241[] = { "/utag.ga.", NULL }; const char *m32f82623[] = { "freehitscounter.org^", NULL }; const char *m32f8d3c9[] = { "viglink.com^api^insert^", NULL }; +const char *m32f90de2[] = { "7lstw4cd.top^", NULL }; const char *m32f92749[] = { "/230x90_", NULL }; const char *m32f96414[] = { "b97beb2fed1c4f.com^", NULL }; const char *m32fb9438[] = { "cqzqdoqsgxyf.com^", NULL }; @@ -7986,6 +7996,7 @@ const char *m351ea630[] = { "uptobox.com", ".ad6media", NULL }; const char *m35213b7 [] = { "^mod^wms^do^view_", "^zone^", NULL }; const char *m3522dcb3[] = { "phncdn.com/assets/", "/js/user_notification.js", NULL }; const char *m35273de3[] = { "wzafekkdp.com^", NULL }; +const char *m35288536[] = { "estream.", "^", NULL }; const char *m352a7351[] = { "angorch-cdr7.com^", NULL }; const char *m352ab81c[] = { "ads.wapx.cn^", NULL }; const char *m352b900f[] = { "union.360.cn/1899.js", NULL }; @@ -8221,6 +8232,7 @@ const char *m3649c938[] = { "gbakhtzvoguz.com^", NULL }; const char *m364b533d[] = { "?event=pixel.", NULL }; const char *m364b6a29[] = { "/exitpopunder.", NULL }; const char *m364d9816[] = { "medscapestatic.com/pi/scripts/ads/dfp/profads2.js", NULL }; +const char *m364f0952[] = { "afgr8.com^", NULL }; const char *m364faaac[] = { "bookofsex.com^", NULL }; const char *m36502eef[] = { "widget.searchschoolsnetwork.com^", NULL }; const char *m365105 [] = { "yoqvnnkdmqfk.com^", NULL }; @@ -8884,6 +8896,7 @@ const char *m39733870[] = { "swtwtbiwbjvq.com^", NULL }; const char *m3974be3d[] = { "regdfh.info^", NULL }; const char *m39754bcb[] = { "addynamix.com^", NULL }; const char *m3976c5cc[] = { "auctionnudge.com^", NULL }; +const char *m3976fd09[] = { "afgr5.com^", NULL }; const char *m397753d2[] = { "/FTTrack2.js", NULL }; const char *m3978892b[] = { "/a.logrequest.yolx?", NULL }; const char *m397bd351[] = { "did-it.com^", NULL }; @@ -9206,6 +9219,7 @@ const char *m3b349088[] = { "octopuspop.com^", NULL }; const char *m3b34a759[] = { "rcwczstm.com^", NULL }; const char *m3b34dc90[] = { "/newadcfg/", NULL }; const char *m3b3837bb[] = { "autotrader.co.uk/page-tracking/", NULL }; +const char *m3b38421c[] = { "afgr6.com^", NULL }; const char *m3b3918c6[] = { "gorgeousground.com^", NULL }; const char *m3b398a5e[] = { "pcp001.com/media/globalPixel.js", NULL }; const char *m3b3a2b35[] = { "cjnqsrzyhil.com^", NULL }; @@ -9393,6 +9407,7 @@ const char *m3c0e79a6[] = { "dcmatjqifoim.com^", NULL }; const char *m3c0f6b90[] = { "pornalized.com/js/adppornalized5.js", NULL }; const char *m3c0fa [] = { "phncdn.com/js/xp_bubble/", NULL }; const char *m3c11327 [] = { "link-empfehlen24.de^", NULL }; +const char *m3c118123[] = { "gmeomlvmqlmu.com^", NULL }; const char *m3c1235be[] = { "mediabong.com/t/", NULL }; const char *m3c1256d3[] = { "netdna-cdn.com^", "-300x250.", NULL }; const char *m3c128cb4[] = { "thepeak.fm/images/banners/", NULL }; @@ -11788,6 +11803,7 @@ const char *m47297af6[] = { "4chan.org/support/", NULL }; const char *m472a3abd[] = { "glo-glo-oom.com^", NULL }; const char *m472a697c[] = { "xmlconfig.ltassrv.com^", NULL }; const char *m472b0725[] = { "behanceserved.com/stats/stats.js?", NULL }; +const char *m472b336e[] = { "=redirect_adv&", NULL }; const char *m472b9dcf[] = { "b1fe8a95ae27823.com^", NULL }; const char *m472cb950[] = { "exqaxblsmev.com^", NULL }; const char *m472d482c[] = { "860dac995620.racing^", NULL }; @@ -12265,6 +12281,7 @@ const char *m4957a09b[] = { "/TrackingData.", NULL }; const char *m4958189c[] = { "gotmojo.com/track/", NULL }; const char *m49587e58[] = { "crm4d.com^", NULL }; const char *m4959a0fc[] = { "_adtop.", NULL }; +const char *m495b1ea0[] = { "d11a2fzhgzqe7i.cloudfront.net^", NULL }; const char *m495bef9 [] = { "thinkgeek.com/js/rts.js", NULL }; const char *m495c07f1[] = { "facetz.net^", NULL }; const char *m495e5d8f[] = { "usaowwbxa.com^", NULL }; @@ -12885,6 +12902,7 @@ const char *m4c658d3a[] = { "itevcsjvtcmb.com^", NULL }; const char *m4c65dd8f[] = { "thessdreview.com^", "^owc-new-gif1.gif", NULL }; const char *m4c6616e2[] = { "uutfeuxmqdvdp.com^", NULL }; const char *m4c67afde[] = { "svyksa.info^", NULL }; +const char *m4c67cae8[] = { "usfmwydo.com^", NULL }; const char *m4c67d838[] = { "cast4u.tv/fku.php", NULL }; const char *m4c6a38f2[] = { "ixtuseq.info^", NULL }; const char *m4c6ab316[] = { "/pixeltracker.", NULL }; @@ -13504,6 +13522,7 @@ const char *m4f3d1fdf[] = { "bom.gov.au/includes/marketing2.php?", NULL }; const char *m4f3d321e[] = { "_psu_ad.", NULL }; const char *m4f408086[] = { "thenonleaguefootballpaper.com^", "-140x300-", NULL }; const char *m4f412a93[] = { "/wtcore.js", NULL }; +const char *m4f416b14[] = { "2performant.com^", NULL }; const char *m4f42b9bb[] = { "bobblewrite.com^", NULL }; const char *m4f43aee2[] = { "/badge_ad_", NULL }; const char *m4f4455d5[] = { "servingpps.com^", NULL }; @@ -13939,6 +13958,7 @@ const char *m5171555c[] = { "urethanes-technology-international.com^", "^banners const char *m517177f6[] = { "mypoints.com/js/", "ga.js?", NULL }; const char *m51732376[] = { "carsxardivaf.com^", NULL }; const char *m5174fc94[] = { "eqcvisodkvphw.bid^", NULL }; +const char *m5175733b[] = { "/jserrLog?", NULL }; const char *m517883ed[] = { "/160x600partner.", NULL }; const char *m5178af11[] = { "logger.su^", NULL }; const char *m51790414[] = { "aster18cdn.nl^", NULL }; @@ -14536,6 +14556,7 @@ const char *m540a1bc7[] = { "_ad_code.", NULL }; const char *m540b7643[] = { "thecommonsenseshow.com/siteupload/", "/ad-survivalapril2017.jpg", NULL }; const char *m540cacc6[] = { "aol.com/ping?", NULL }; const char *m540dde2 [] = { "/www/ad_", NULL }; +const char *m540eafa0[] = { "/rpc/preccount?", NULL }; const char *m540faee5[] = { "7a042b464636.com^", NULL }; const char *m541046d6[] = { "forms.aweber.com^", "^displays.htm^id^", NULL }; const char *m5410b8e8[] = { "/abmw/", NULL }; @@ -14825,6 +14846,7 @@ const char *m554dd244[] = { "?_siteid=", NULL }; const char *m554de5f5[] = { "redtube.com/js/redtube.js?", NULL }; const char *m554e8e5d[] = { "lypn.com^", NULL }; const char *m554fc8e [] = { "openx.zomoto.nl/live/www/delivery/spcjs.php?id=", NULL }; +const char *m55504c0c[] = { "link.tym.cool^", NULL }; const char *m5550ba8b[] = { "cnetwidget.creativemark.co.uk^", NULL }; const char *m5552a52e[] = { "smrtlnks.com^", NULL }; const char *m5552b61c[] = { "/ocount.php", NULL }; @@ -14869,6 +14891,7 @@ const char *m557352b8[] = { "ads.eatinparis.com^", NULL }; const char *m5573bd6f[] = { "losecounter.de^", NULL }; const char *m5573d915[] = { "ibtimes.co.uk/", "/adframe.js", NULL }; const char *m5574fe95[] = { "aimediagroup.com^", NULL }; +const char *m5575232a[] = { "tufpmrcdc.com^", NULL }; const char *m55769a4a[] = { "/ad_function.", NULL }; const char *m55777a46[] = { "tvbrowser.org/logo_df_tvsponsor_", NULL }; const char *m5577f9c1[] = { "/AdobeCustomVideoMeasurement.swf", NULL }; @@ -15239,7 +15262,6 @@ const char *m5765307f[] = { "picsexhub.com/rec/", NULL }; const char *m576755a5[] = { "customer.io^", NULL }; const char *m5767a5df[] = { "limon.biz^", NULL }; const char *m57696fb4[] = { "shhngaasah.com^", NULL }; -const char *m576c48f5[] = { "estream.nu^", NULL }; const char *m576fe782[] = { "fllwert.net^", NULL }; const char *m57709265[] = { "adsremote.scrippsnetworks.com^", NULL }; const char *m5770eb77[] = { "/partnerads/", NULL }; @@ -17599,6 +17621,7 @@ const char *m62597c40[] = { "walprater.com^", NULL }; const char *m625bfd8e[] = { "/bansrc/", NULL }; const char *m625c5deb[] = { "ad.outsidehub.com^", NULL }; const char *m625cde31[] = { "ads.youtube.com^", NULL }; +const char *m625fa870[] = { "marketshot.com^", NULL }; const char *m625fb261[] = { "173.199.120.7/delivery/", NULL }; const char *m62602d77[] = { "xubqqaqhotit.com^", NULL }; const char *m6261aba3[] = { "liveperson.net/hc/", "/?visitor=", NULL }; @@ -17774,6 +17797,7 @@ const char *m63384fb4[] = { "eventlog.inspsearchapi.com^", NULL }; const char *m6339c4ea[] = { "algnnojsdr.com^", NULL }; const char *m633a9a5b[] = { "/cdn-cgi/pe/bag2?r", "content.ad", NULL }; const char *m633aa2d8[] = { "el-mundo.net/js/fm", ".js", NULL }; +const char *m633d596c[] = { "retargeting.biz^", NULL }; const char *m633e17e4[] = { "71dfd978db603cea92a.com^", NULL }; const char *m6340a88e[] = { "jeetyetmedia.com^", NULL }; const char *m6342b261[] = { "adtaily.eu^", NULL }; @@ -19128,6 +19152,7 @@ const char *m694a425e[] = { "webmeter.ws^", NULL }; const char *m694ca079[] = { "botsvisit.com^", NULL }; const char *m694ce5b8[] = { ".io/ads.", NULL }; const char *m694f671a[] = { "accessintel.com^", NULL }; +const char *m69506f1a[] = { "log.aimtell.com^", NULL }; const char *m695278f9[] = { "cgbemyws.bid^", NULL }; const char *m69569da5[] = { "tny.cz/oo/", NULL }; const char *m6956bb0f[] = { "pinkhoneypots.com^", NULL }; @@ -19365,6 +19390,7 @@ const char *m6a4f92cf[] = { "as.base.de^", NULL }; const char *m6a524f29[] = { "brobible.com/files/uploads/images/takeovers/", NULL }; const char *m6a5375c1[] = { "analyzer2.fc2.com^", NULL }; const char *m6a5412a7[] = { "drf-global.com/servicegateway/globaltrips-shopping-svcs/drfadserver-1.0/pub/adserver.js?", NULL }; +const char *m6a557553[] = { "walmart.com/tealeaf", NULL }; const char *m6a55d39b[] = { "xegvnhpwytev.com^", NULL }; const char *m6a569050[] = { "scribol.com/traffix/widget_tracker/", NULL }; const char *m6a569925[] = { "glamour.com/aspen/components/cn-fe-ads/js/cn.dart.js", NULL }; @@ -19889,6 +19915,7 @@ const char *m6cc87fa6[] = { "/modoweb-tracking/", NULL }; const char *m6ccc9889[] = { "/clickmap.js", NULL }; const char *m6ccce0cb[] = { "leadid.com^", NULL }; const char *m6ccdc62c[] = { "/imageTracking.", NULL }; +const char *m6cd188e3[] = { "/mediametrie.js", NULL }; const char *m6cd40e0a[] = { "/views/ads/", NULL }; const char *m6cd41043[] = { "/adserv.", NULL }; const char *m6cd4a84a[] = { "ypfghpqnkgbxu.bid^", NULL }; @@ -20335,6 +20362,7 @@ const char *m6edec0d9[] = { "_mmsadbanner/", NULL }; const char *m6ee4e8fb[] = { "/nextdaymedia-ads/", NULL }; const char *m6ee7e99d[] = { "useriq.com^", NULL }; const char *m6ee8857a[] = { "dashboard.marketgid.com^", NULL }; +const char *m6ee8901e[] = { "d158nafix8anfs.cloudfront.net^", NULL }; const char *m6eea1968[] = { "privatewifi.com/swf/banners/", NULL }; const char *m6eeed2ad[] = { "search.firstplace.com^", "pageview", NULL }; const char *m6ef15b99[] = { "komikslandia.pl/environment/cache/images/300_250_", NULL }; @@ -21738,6 +21766,7 @@ const char *m7538001d[] = { "bestquickcontentfiles.com^", NULL }; const char *m7538b06c[] = { "/advertisingmanual.", NULL }; const char *m75392245[] = { "/ga-beacon.", "/UA-", NULL }; const char *m753a728 [] = { "letsgoshopping.tk^", NULL }; +const char *m753af591[] = { "/top_tagcommander+", NULL }; const char *m753b95df[] = { "loakfiiggz.bid^", NULL }; const char *m753cf82a[] = { "exwp.org/partners/", NULL }; const char *m753ea359[] = { "seomonitor.ro^", NULL }; @@ -22887,6 +22916,7 @@ const char *m7a8cdae [] = { "hfedxxuvtjtqs.com^", NULL }; const char *m7a8d1921[] = { "srppykbedhqp.com^", NULL }; const char *m7a8fd21e[] = { "weuigcsch31.com^", NULL }; const char *m7a919b2a[] = { "zykqvbxfdqbdvj.com^", NULL }; +const char *m7a92fef3[] = { "fxdglnldbnyq.com^", NULL }; const char *m7a943de6[] = { "insightera.com^", NULL }; const char *m7a958079[] = { "escale.to^", NULL }; const char *m7a95e381[] = { "pussl46.com^", NULL }; @@ -24050,6 +24080,7 @@ const char *m7ff68fff[] = { "kgnxtdcf.bid^", NULL }; const char *m7ff8410a[] = { "classistatic.com^", "^sponsors^", NULL }; const char *m7ff8768e[] = { "jtqfggxxk.bid^", NULL }; const char *m7ffa2ecc[] = { "find-cheap-hotels.org^", NULL }; +const char *m7ffb3329[] = { "wzismevwhqixlq.com^", NULL }; const char *m7ffbf8d [] = { "judgeporn.com/video_pop.php?", NULL }; const char *m7ffe42b5[] = { "/adpositionsizein-", NULL }; const char *m7ffe6407[] = { "/chartbeat.min.js", NULL }; @@ -25875,6 +25906,7 @@ const char *m88d2c63d[] = { "/counters/pages?", NULL }; const char *m88d2ef4d[] = { "adtools.gossipkings.com^", NULL }; const char *m88d3e975[] = { "newmail.pronpic.org^", NULL }; const char *m88d5a873[] = { "newyorker.com/wp-content/assets/js/vendors/cn-fe-ads/cn.dart.js", NULL }; +const char *m88d9ae0a[] = { "spiffymachine.com^", NULL }; const char *m88dbeef5[] = { "alphaporno.com/", ".php", NULL }; const char *m88ddcb4 [] = { "uzkkocgdasr.bid^", NULL }; const char *m88de1eb2[] = { "sulvo.co^", NULL }; @@ -28061,6 +28093,7 @@ const char *m93158c08[] = { "evisitcs.com^", NULL }; const char *m9315adbb[] = { "tbwaaekocue.bid^", NULL }; const char *m9315fca4[] = { "jzthapvjlq.bid^", NULL }; const char *m93166799[] = { ".jsp/?Log=", NULL }; +const char *m93173622[] = { "ngptxgpbdnutvi.com^", NULL }; const char *m9318fdbf[] = { "dcmhpbpdcsy.com^", NULL }; const char *m931a6179[] = { "dkvzpqcqan.com^", NULL }; const char *m931d5eb [] = { "iyi.net^", NULL }; @@ -28329,6 +28362,7 @@ const char *m946148a8[] = { "ajmyrtdiwvg.bid^", NULL }; const char *m9464554e[] = { "nanopress.it/lab.js", NULL }; const char *m9464633c[] = { "reundcwkqvctq.com^", NULL }; const char *m9464c6c [] = { "acrididae.com^", NULL }; +const char *m9465a7ba[] = { "/servlet/click/zone?", NULL }; const char *m9466ac3d[] = { "/adseperator_", NULL }; const char *m94695a5 [] = { "kbb.com/js/advert.js", NULL }; const char *m946ebc1f[] = { "linknotification.com^", NULL }; @@ -31431,6 +31465,7 @@ const char *ma33069bf[] = { "_adobjects.", NULL }; const char *ma330a849[] = { "dxtveuux.com^", NULL }; const char *ma3314495[] = { "adoperator.com^", NULL }; const char *ma3324220[] = { "koldcast.tv/mint/", "/tracker.php?", NULL }; +const char *ma3336e64[] = { "beampulse.com^", NULL }; const char *ma335db6b[] = { "/BackgroundAd40.", NULL }; const char *ma338e034[] = { "reverbnation.com/widgets/trk/", NULL }; const char *ma339aae3[] = { "jrrmwjybfaztct.com^", NULL }; @@ -31509,6 +31544,7 @@ const char *ma395ec81[] = { "mdtrack.click^", NULL }; const char *ma39c7115[] = { "cryptonoter.com^", NULL }; const char *ma39dffb [] = { "ro89.com/hitme.php?", NULL }; const char *ma39ebda8[] = { "ludwmwca.bid^", NULL }; +const char *ma39ec6b3[] = { "vsxjjmyz.com^", NULL }; const char *ma39faed1[] = { "circonus.com/hit?", NULL }; const char *ma3a53acc[] = { "/300_250_", NULL }; const char *ma3a60b8d[] = { "/technomedia.", NULL }; @@ -32025,6 +32061,7 @@ const char *ma5ef505e[] = { "/banner/700", NULL }; const char *ma5ef9361[] = { "/lijit-ad-", NULL }; const char *ma5f0fd3a[] = { "ualobhbpjbjtm.bid^", NULL }; const char *ma5f13730[] = { "/ad_hcr_", NULL }; +const char *ma5f264b4[] = { "consciouschairs.com^", NULL }; const char *ma5f4a118[] = { "referforex.com^", NULL }; const char *ma5f554f9[] = { "krxpudrzyvko.com^", NULL }; const char *ma5f7517a[] = { "adclick.lv^", NULL }; @@ -32397,6 +32434,7 @@ const char *ma7b7bb7a[] = { "buzzfeed.com^", "^small.gif^", NULL }; const char *ma7b892c8[] = { "/cdn.ad.", NULL }; const char *ma7ba8caf[] = { "ppcindo.com^", NULL }; const char *ma7bc90e7[] = { "static.pornhub.phncdn.com^", NULL }; +const char *ma7bca060[] = { "/www/deliver/", NULL }; const char *ma7bd082f[] = { "hostedads.realitykings.com^", NULL }; const char *ma7bd26ff[] = { "crawlability.com^", NULL }; const char *ma7bde65e[] = { "oldtiger.net^", NULL }; @@ -33693,6 +33731,7 @@ const char *madb4b768[] = { "/cdn-cgi/pe/bag2?", ".speednetwork1.com", NULL }; const char *madb62321[] = { "giwvzhflxv.bid^", NULL }; const char *madb67fa [] = { "video.economist.com/adfinder.jsp?", NULL }; const char *madb754a2[] = { "advertpay.net^", NULL }; +const char *madb8eebe[] = { "iaudienc.com^", NULL }; const char *madba091f[] = { "/your-ad.", NULL }; const char *madbab8c5[] = { "/usr.gif?openratetracking=", NULL }; const char *madbb486b[] = { "irjaeupzarkvwmxonaeslgicvjvgdruvdywmdvuaoyfsjgdzhk.com^", NULL }; @@ -34587,6 +34626,7 @@ const char *mb1a28fca[] = { "tperkulpflry.bid^", NULL }; const char *mb1a2c2eb[] = { "/displayadiframe.", NULL }; const char *mb1a2c86c[] = { "giyupoeynkfx.com^", NULL }; const char *mb1a3c1f [] = { "qrrro.com^", "^adhandler^", NULL }; +const char *mb1a69ac6[] = { "alogationa.co^", NULL }; const char *mb1a73597[] = { "cbrqndeptsw.com^", NULL }; const char *mb1a79b09[] = { "/i?stm=", "&refr=", "&url=", NULL }; const char *mb1a82e36[] = { "gallery.aethereality.net/advertisement.js", NULL }; @@ -34942,6 +34982,7 @@ const char *mb354dfeb[] = { "cdn7.network^", NULL }; const char *mb35626a5[] = { "seatgeek.com/sixpack/participate?", NULL }; const char *mb3564344[] = { "zoomdirect.com.au^", NULL }; const char *mb356f201[] = { "ozone.ru^", NULL }; +const char *mb358ffb2[] = { "_assets/metrics-", NULL }; const char *mb35a2e78[] = { "gamesgames.com/WebAnalysis/", NULL }; const char *mb35a56c7[] = { "web-18.com/common/w18a26062012143253_min.js", NULL }; const char *mb35b7e54[] = { "dpmsrv.com^", NULL }; @@ -35211,6 +35252,7 @@ const char *mb49d3ea7[] = { "ox2.pron.tv^", NULL }; const char *mb49ec3ec[] = { ".com/b.gif?", NULL }; const char *mb4a02a [] = { "_adshow.", NULL }; const char *mb4a19fe9[] = { "/count/count.cgi?", NULL }; +const char *mb4a2b45c[] = { "&funnel_state=", NULL }; const char *mb4a357c0[] = { "rs.mail.ru^", NULL }; const char *mb4a54c16[] = { "wrcjfm.org/images/banners/", NULL }; const char *mb4a5fec2[] = { "kulkaridoopi.com^", NULL }; @@ -36359,6 +36401,7 @@ const char *mb9fa276c[] = { "/public/js/ad/", NULL }; const char *mb9fc99b2[] = { "sexgalaxy.net/wp-content/themes/annina-pro/js/theia-sticky-sidebar.min.js?", NULL }; const char *mb9fe5974[] = { "iscaebizkzyd.com^", NULL }; const char *mb9ff2836[] = { "palerra.net/apprity/api/analytics/", NULL }; +const char *mba00c29f[] = { "afgr7.com^", NULL }; const char *mba00e480[] = { "thecountrycaller.com/showads.php", NULL }; const char *mba01364f[] = { "playgames2.com/default160x160.php", NULL }; const char *mba01cf4f[] = { ".biz/ad/", NULL }; @@ -36425,6 +36468,7 @@ const char *mba3e5faa[] = { "tag4arm.com^", NULL }; const char *mba3ed6f5[] = { "/adsdm.", NULL }; const char *mba3faf30[] = { "7edc0b1cdcb8.com^", NULL }; const char *mba4086e9[] = { "satellites.co.uk/images/sponsors/", NULL }; +const char *mba4185b9[] = { "/smartad_", NULL }; const char *mba42020e[] = { "gulvkhfah.bid^", NULL }; const char *mba424062[] = { "track-web.net^", NULL }; const char *mba446079[] = { "?adunitname=", NULL }; @@ -37084,6 +37128,7 @@ const char *mbd5799ed[] = { "intextdirect.com^", NULL }; const char *mbd586246[] = { "/logcollect.", NULL }; const char *mbd59f27 [] = { "pwrads.net^", NULL }; const char *mbd5a3043[] = { "/standalone/ads-", NULL }; +const char *mbd5cca29[] = { "stascorp.com/stat/", NULL }; const char *mbd5d44c5[] = { "e0a42e1a21669b.com^", NULL }; const char *mbd624de7[] = { "clicks4ads.com^", NULL }; const char *mbd632804[] = { "adloaded.com^", NULL }; @@ -37677,6 +37722,7 @@ const char *mc0171461[] = { "yimg.com/hl/ap/", "_takeover_", NULL }; const char *mc017a75e[] = { "/banner460x80.", NULL }; const char *mc0199f7b[] = { "clickfunnels.com/userevents/", NULL }; const char *mc019c1bb[] = { "iaoyikwmocuvr.com^", NULL }; +const char *mc01ab553[] = { "slfsmf.com^", NULL }; const char *mc01b12b8[] = { "xidx.org^", NULL }; const char *mc01b73c3[] = { "/v5/ads/", NULL }; const char *mc01d39a9[] = { "admailtiser.com^", NULL }; @@ -40484,6 +40530,7 @@ const char *mcd306cb9[] = { "/GoogleAnalytics2", NULL }; const char *mcd30ff8d[] = { "heraldm.com^", "^company_bn^", NULL }; const char *mcd312a5 [] = { "txjdgm53.win^", NULL }; const char *mcd313707[] = { "johansens.com^", "^LogPageView", NULL }; +const char *mcd33b349[] = { "/adloader/", NULL }; const char *mcd354435[] = { "fyreball.com^", NULL }; const char *mcd36e90d[] = { "/fbevents-amd.js", NULL }; const char *mcd3a3de0[] = { "pbterra.com^", NULL }; @@ -40869,6 +40916,7 @@ const char *mcef3a820[] = { "/xy.gif?", NULL }; const char *mcef457b4[] = { "jvepcgbq.bid^", NULL }; const char *mcef4672c[] = { "_300-250-", NULL }; const char *mcef5f888[] = { "/adleftsidebar.", NULL }; +const char *mcef7691 [] = { "=metrics_profile&", NULL }; const char *mcef8a5f9[] = { "xrivpngzagpy.com^", NULL }; const char *mcefa88a8[] = { "knxwoaewryxaxd.bid^", NULL }; const char *mcefc5126[] = { "njswarysemyf.bid^", NULL }; @@ -41306,6 +41354,7 @@ const char *md0e641f6[] = { "uiydukxbls.bid^", NULL }; const char *md0e7a739[] = { "/your_ad.", NULL }; const char *md0eaac99[] = { "ar51.eu/ad/advertisement.js", NULL }; const char *md0ed1eb9[] = { "eluxe.ca^", "_doubleclick.js", ".pagespeed.", NULL }; +const char *md0ef68fe[] = { "/vjslog?", NULL }; const char *md0f09c76[] = { "yuituityula.com^", NULL }; const char *md0f0a5cd[] = { "yieldselect.com^", NULL }; const char *md0f2c93c[] = { "/SidebarAds.", NULL }; @@ -41333,6 +41382,7 @@ const char *md1081a76[] = { "ubudigital.com^", NULL }; const char *md1099c5c[] = { "d1cr9zxt7u0sgu.cloudfront.net^", NULL }; const char *md10e265 [] = { "ads.indeed.com^", NULL }; const char *md1129f47[] = { "ofpwdoovxs.bid^", NULL }; +const char *md11742b4[] = { "beacon.aimtell.com^", NULL }; const char *md1176326[] = { "apugod.work^", NULL }; const char *md11895e8[] = { "datamind.ru^", NULL }; const char *md119e80a[] = { "/ga_keyword2.", NULL }; @@ -44359,7 +44409,6 @@ const char *mdf08b685[] = { "wp.com/_static/", "/vip-analytics.js?", NULL }; const char *mdf093767[] = { "://anx.", "/anx.gif?", NULL }; const char *mdf0c4106[] = { "directchat.tv^", NULL }; const char *mdf0cf2e2[] = { "gitcdn.org/libs/", NULL }; -const char *mdf0d8d98[] = { "pirateproxy.nl/inc/ex.js", NULL }; const char *mdf0e272f[] = { "/aff/ads_", NULL }; const char *mdf0f4236[] = { "doubleclick.net/N2/pfadx/video.allthingsd.com/", NULL }; const char *mdf11bf3 [] = { "google.", "/gen_204?", NULL }; @@ -46248,6 +46297,7 @@ const char *me7f79e6e[] = { "clickredirection.com^", NULL }; const char *me7f7fe3c[] = { "modelsgonebad.com^", NULL }; const char *me7f892ed[] = { "nonpaly.ru^", NULL }; const char *me7f8dac0[] = { "ads.deviantart.com^", NULL }; +const char *me7fcbc6f[] = { "/p?zoneId=", NULL }; const char *me7fd5464[] = { "://banners.", NULL }; const char *me7fdab26[] = { "dw.com.com^", NULL }; const char *me7fe0333[] = { "emeqnqxd.bid^", NULL }; @@ -46848,6 +46898,7 @@ const char *meae3d30b[] = { "track.adform.net/serving/scripts/trackpoint/", NULL const char *meae481f9[] = { "adverts.carltononline.com^", NULL }; const char *meae61a60[] = { "whsjufifuwkw.com^", NULL }; const char *meae7a25a[] = { "bnc.lt^", NULL }; +const char *meae80f15[] = { "afgr9.com^", NULL }; const char *meae983ab[] = { "/visitor.gif?ts=", NULL }; const char *meaeb819d[] = { "legendarylars.com^", NULL }; const char *meaec86fa[] = { "/adv/interstitial.", NULL }; @@ -47242,6 +47293,7 @@ const char *mecaac7d6[] = { "dd3p.com/sensor/ddsense.aspx?", NULL }; const char *mecab8f6a[] = { "cloudzilla.to/cam/wpop.php", NULL }; const char *mecace602[] = { "/ads_1.", NULL }; const char *mecae97f [] = { "vserv.bc.cdn.bitgravity.com^", NULL }; +const char *mecaea957[] = { "2parale.ro^", NULL }; const char *mecaf0572[] = { "/adruptive.", NULL }; const char *mecb3999a[] = { "8ff01bde37db289d5.com^", NULL }; const char *mecb417c5[] = { "wredint.com^", NULL }; @@ -47544,6 +47596,7 @@ const char *mee04839d[] = { "/plugins/wp125/", NULL }; const char *mee06a446[] = { "prtracker.com^", NULL }; const char *mee06d922[] = { "96.9.176.245^", NULL }; const char *mee081495[] = { "hits-", ".iubenda.com^", NULL }; +const char *mee081f2f[] = { "/packages/dfp/", NULL }; const char *mee081fd5[] = { "wxmzfxthsnrgpu.bid^", NULL }; const char *mee0b2ac0[] = { "/adorika728.", NULL }; const char *mee0c34eb[] = { "xwwvcsquuhbd.com^", NULL }; @@ -47672,6 +47725,7 @@ const char *mee9d8fd4[] = { "hulu.com/beacon/v3/playback?", NULL }; const char *mee9db3d8[] = { "xssburizmrmd.bid^", NULL }; const char *mee9f4d28[] = { "trker.com^", NULL }; const char *meea169d6[] = { "/ad/quigo/", NULL }; +const char *meea547ce[] = { "=eureka_", NULL }; const char *meea71443[] = { "newsletter.mybboard.net/open.php?", NULL }; const char *meea8f5a4[] = { "analytics.edgesuite.net/html5/akamaihtml5-min.js?", NULL }; const char *meea95bcb[] = { "fm.tuba.pl/tuba3/_js/advert.js", NULL }; @@ -48235,6 +48289,7 @@ const char *mf15db410[] = { "adgeo.163.com^", NULL }; const char *mf15eae3d[] = { "yimg.com/ks/plugin/adplugin.swf?", NULL }; const char *mf1611fe5[] = { "tracker.iltrovatore.it^", NULL }; const char *mf1618dce[] = { "literotica.com/images/lit_banners/", NULL }; +const char *mf161c40b[] = { "afgr10.com^", NULL }; const char *mf163f0ce[] = { "adf.ly/js/", NULL }; const char *mf1651781[] = { "/adwrapper/", NULL }; const char *mf1657f6a[] = { "elite-s001.com^", NULL }; @@ -48604,6 +48659,7 @@ const char *mf33a5c33[] = { "andreas-unterberger.at/includes/js/helperFunctions. const char *mf33a7696[] = { "ymages.org/prepop.php", NULL }; const char *mf33ac087[] = { "adfill.me^", NULL }; const char *mf33b33a6[] = { "thewb.com/thewb/swf/tmz-adblock/", NULL }; +const char *mf33e29ff[] = { "/request_tracker+", NULL }; const char *mf33e8a7d[] = { "zmovie.tv^", NULL }; const char *mf33ecb7d[] = { "bridgetrack.com/site/", NULL }; const char *mf33f5044[] = { "gmads.net^", NULL }; @@ -49342,6 +49398,7 @@ const char *mf69a5b3c[] = { "on.net/images/gon_nodestore.jpg", NULL }; const char *mf69bf4d0[] = { "amnpmitevuxx.com^", NULL }; const char *mf69d2b4a[] = { "/analytics/events", NULL }; const char *mf6a019e9[] = { "constantcontact.com/js/WebTracking/", NULL }; +const char *mf6a16644[] = { "wduygininqbu.com^", NULL }; const char *mf6a1e949[] = { "inq.com/tagserver/logging/", NULL }; const char *mf6a36a8b[] = { "/wp-popup-scheduler/", NULL }; const char *mf6a3b492[] = { "money4ads.com^", NULL }; @@ -49819,6 +49876,7 @@ const char *mf8c12118[] = { "-ad-gif1-", NULL }; const char *mf8c26d59[] = { "0icep80f.com^", NULL }; const char *mf8c35429[] = { "/leaderboardads.", NULL }; const char *mf8c5c174[] = { "warnerbros-d.openx.net^", NULL }; +const char *mf8c641a9[] = { "marketshot.fr^", NULL }; const char *mf8c74f0e[] = { "/popunder5.", NULL }; const char *mf8c7b735[] = { "crmbuyer.com^", "^sda^", NULL }; const char *mf8c820d8[] = { "obzatop.info^", NULL }; @@ -51471,7 +51529,6 @@ const char *d1d35d3b1[] = { "socketloop.com", NULL }; const char *d1d486bc6[] = { "rankbank.net", NULL }; const char *d1d4ca3f [] = { "youngcons.com", NULL }; const char *d1d95e106[] = { "traileraddict.com", NULL }; -const char *d1d9deb1e[] = { "100percentfedup.com", "activistpost.com", "addictinginfo.com", "alfonzorachel.com", "allenwestrepublic.com", "allthingsvegas.com", "americansublime.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bestfunnyjokes4u.com", "bighealthreport.com", "bipartisanreport.com", "breaking911.com", "breathecast.com", "bulletsfirst.net", "celebrity-gossip.net", "clashdaily.com", "classicalite.com", "collapse.news", "comicallyincorrect.com", "conservativebyte.com", "conservativeintel.com", "conservativevideos.com", "constitution.com", "coviral.com", "craigjames.com", "creepybasement.com", "crossmap.com", "cyberwar.news", "dailyfeed.co.uk", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "dccrimestories.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "evil.news", "fitnessconnoisseur.com", "foreverymom.com", "freedom.news", "freedomdaily.com", "freedomforce.com", "freedomoutpost.com", "freewarefiles.com", "gamerant.com", "girlsjustwannahaveguns.com", "glitch.news", "godfatherpolitics.com", "groopspeak.com", "guardianlv.com", "guns.news", "gymflow100.com", "hallels.com", "hautereport.com", "healthstatus.com", "hispolitica.com", "hngn.com", "honesttopaws.com", "ifyouonlynews.com", "infowars.com", "instigatornews.com", "janmorganmedia.com", "jobsnhire.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "liberty.news", "libertyalliance.com", "libertyunyielding.com", "lidblog.com", "medicine.news", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "natural.news", "naturalblaze.com", "naturalnews.com", "naturalsociety.com", "natureworldnews.com", "newser.com", "newseveryday.com", "newsthump.com", "oddee.com", "patriotoutdoornews.com", "patriottribune.com", "pickthebrain.com", "politicaloutcast.com", "politichicks.com", "practicallyviral.com", "quirlycues.com", "rantlifestyle.com", "realfarmacy.com", "realmomsrealreviews.com", "realtytoday.com", "redhotchacha.com", "redmaryland.com", "returnofkings.com", "robotics.news", "shark-tank.com", "shedthoselbs.com", "slender.news", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "stupid.news", "techconsumer.com", "techtimes.com", "theblacksphere.net", "theboredmind.com", "thefreethoughtproject.com", "thegatewaypundit.com", "thehayride.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "twisted.news", "usherald.com", "valuewalk.com", "vcpost.com", "vgpie.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "wakingtimes.com", "wnd.com", "xtribune.com", "youthhealthmag.com", NULL }; const char *d1dc4a272[] = { "afreesms.com", NULL }; const char *d1e096c38[] = { "lindaikeji.blogspot.com", NULL }; const char *d1e0c8df1[] = { "dailycaller.com", "realhardwarereviews.com", "thepoliticalinsider.com", NULL }; @@ -51711,6 +51768,7 @@ const char *d42cbe396[] = { "kapaza.be", NULL }; const char *d433b238a[] = { "xhamster.com", NULL }; const char *d433d1a8d[] = { "timesofindia.indiatimes.com", NULL }; const char *d4341ab02[] = { "750g.com", "alibabuy.com", "allocine.fr", "cap-cine.fr", "chartsinfrance.net", "cotecine.fr", "easyvols.fr", "easyvoyage.com", "get-the-look.fr", "jeuxactu.com", "jeuxvideo.com", "lestream.fr", "millenium.org", "musiquemag.com", "ouest-france.fr", "ozap.com", "purebreak.com", "purepeople.com", "puretrend.com", "shopoon.fr", "terrafemina.com", NULL }; +const char *d434fc682[] = { "100percentfedup.com", "activistpost.com", "addictinginfo.com", "alfonzorachel.com", "allenwestrepublic.com", "allthingsvegas.com", "americansublime.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bestfunnyjokes4u.com", "bighealthreport.com", "bipartisanreport.com", "breaking911.com", "breathecast.com", "bulletsfirst.net", "celebrity-gossip.net", "clashdaily.com", "classicalite.com", "collapse.news", "comicallyincorrect.com", "conservativebyte.com", "conservativeintel.com", "conservativevideos.com", "constitution.com", "coviral.com", "craigjames.com", "creepybasement.com", "crossmap.com", "cyberwar.news", "dailyfeed.co.uk", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "dccrimestories.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "evil.news", "fitnessconnoisseur.com", "foreverymom.com", "freedom.news", "freedomdaily.com", "freedomforce.com", "freedomoutpost.com", "freewarefiles.com", "gamerant.com", "gamersheroes.com", "girlsjustwannahaveguns.com", "glitch.news", "godfatherpolitics.com", "groopspeak.com", "guardianlv.com", "guns.news", "gymflow100.com", "hallels.com", "hautereport.com", "healthstatus.com", "hispolitica.com", "hngn.com", "honesttopaws.com", "ifyouonlynews.com", "infowars.com", "instigatornews.com", "janmorganmedia.com", "jobsnhire.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "liberty.news", "libertyalliance.com", "libertyunyielding.com", "lidblog.com", "medicine.news", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "natural.news", "naturalblaze.com", "naturalnews.com", "naturalsociety.com", "natureworldnews.com", "newser.com", "newseveryday.com", "newsthump.com", "oddee.com", "patriotoutdoornews.com", "patriottribune.com", "pickthebrain.com", "politicaloutcast.com", "politichicks.com", "practicallyviral.com", "quirlycues.com", "rantlifestyle.com", "realfarmacy.com", "realmomsrealreviews.com", "realtytoday.com", "redhotchacha.com", "redmaryland.com", "returnofkings.com", "robotics.news", "shark-tank.com", "shedthoselbs.com", "slender.news", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "stupid.news", "techconsumer.com", "techtimes.com", "theblacksphere.net", "theboredmind.com", "thefreethoughtproject.com", "thegatewaypundit.com", "thehayride.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "twisted.news", "usherald.com", "valuewalk.com", "vcpost.com", "vgpie.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "wakingtimes.com", "wnd.com", "xtribune.com", "youthhealthmag.com", NULL }; const char *d435cca54[] = { "daisuki.net", NULL }; const char *d43be7848[] = { "oralb.de", NULL }; const char *d43cec321[] = { "twer.info", NULL }; @@ -51768,6 +51826,7 @@ const char *d4cd4828d[] = { "netcombo.com.br", "saraiva.com.br", "tugatech.com.p const char *d4cdde2f2[] = { "9anime.is", NULL }; const char *d4d13c4b9[] = { "empireonline.com", NULL }; const char *d4d1ce910[] = { "casinobonus24.se", "top5casinosites.co.uk", NULL }; +const char *d4d1f93b6[] = { "activistpost.com", "addictinginfo.com", "alfonzorachel.com", "allenwestrepublic.com", "allthingsvegas.com", "americansublime.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bestfunnyjokes4u.com", "bighealthreport.com", "bipartisanreport.com", "breaking911.com", "breathecast.com", "bugout.news", "bulletsfirst.net", "celebrity-gossip.net", "clashdaily.com", "classicalite.com", "collapse.news", "comicallyincorrect.com", "conservativebyte.com", "conservativeintel.com", "conservativevideos.com", "constitution.com", "coviral.com", "craigjames.com", "creepybasement.com", "crossmap.com", "cyberwar.news", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "dccrimestories.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "evil.news", "fitnessconnoisseur.com", "foreverymom.com", "freedom.news", "freedomdaily.com", "freedomforce.com", "freedomoutpost.com", "freewarefiles.com", "gamerant.com", "gamersheroes.com", "girlsjustwannahaveguns.com", "godfatherpolitics.com", "groopspeak.com", "guardianlv.com", "guns.news", "gymflow100.com", "hallels.com", "hautereport.com", "healthstatus.com", "hispolitica.com", "hngn.com", "honesttopaws.com", "ifyouonlynews.com", "infowars.com", "instigatornews.com", "jobsnhire.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "liberty.news", "libertyalliance.com", "libertyunyielding.com", "lidblog.com", "medicine.news", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "natural.news", "naturalblaze.com", "naturalnews.com", "naturalsociety.com", "natureworldnews.com", "newser.com", "newseveryday.com", "newsthump.com", "oddee.com", "patriotoutdoornews.com", "patriottribune.com", "pickthebrain.com", "politicaloutcast.com", "politichicks.com", "practicallyviral.com", "quirlycues.com", "rantlifestyle.com", "realfarmacy.com", "realmomsrealreviews.com", "realtytoday.com", "redhotchacha.com", "redmaryland.com", "returnofkings.com", "robotics.news", "shark-tank.com", "shedthoselbs.com", "slender.news", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "stupid.news", "techconsumer.com", "techtimes.com", "theblacksphere.net", "thefreethoughtproject.com", "thegatewaypundit.com", "thehayride.com", "thelibertarianrepublic.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "twisted.news", "usherald.com", "valuewalk.com", "vcpost.com", "vgpie.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "wakingtimes.com", "wnd.com", "xtribune.com", "youthhealthmag.com", NULL }; const char *d4d21e4b5[] = { "audiforums.com", NULL }; const char *d4d5705f0[] = { "allmusic.com", "sidereel.com", NULL }; const char *d4d5ae822[] = { "cc.com", NULL }; @@ -52387,6 +52446,7 @@ const char *dacca6ed4[] = { "100percentfedup.com", "activistpost.com", "addictin const char *dad65c43e[] = { "superfilm.pl", NULL }; const char *dad7289aa[] = { "100percentfedup.com", "activistpost.com", "addictinginfo.com", "alfonzorachel.com", "allenwestrepublic.com", "allthingsvegas.com", "americansublime.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bestfunnyjokes4u.com", "bighealthreport.com", "bipartisanreport.com", "breaking911.com", "breathecast.com", "bulletsfirst.net", "celebrity-gossip.net", "clashdaily.com", "classicalite.com", "collapse.news", "comicallyincorrect.com", "conservativebyte.com", "conservativevideos.com", "constitution.com", "coviral.com", "craigjames.com", "creepybasement.com", "crossmap.com", "cyberwar.news", "dailydot.com", "dailyfeed.co.uk", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "dccrimestories.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "evil.news", "fitnessconnoisseur.com", "foreverymom.com", "freedom.news", "freedomdaily.com", "freedomforce.com", "freedomoutpost.com", "girlsjustwannahaveguns.com", "glitch.news", "groopspeak.com", "guardianlv.com", "guns.news", "gymflow100.com", "hallels.com", "hautereport.com", "healthstatus.com", "hispolitica.com", "hngn.com", "honesttopaws.com", "ifyouonlynews.com", "infowars.com", "instigatornews.com", "jobsnhire.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "liberty.news", "libertyalliance.com", "libertyunyielding.com", "lidblog.com", "medicine.news", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "natural.news", "naturalblaze.com", "naturalnews.com", "naturalsociety.com", "natureworldnews.com", "newser.com", "newseveryday.com", "newsthump.com", "oddee.com", "patriotnewswire.com", "patriotoutdoornews.com", "patriottribune.com", "pickthebrain.com", "politicaloutcast.com", "politichicks.com", "practicallyviral.com", "quirlycues.com", "rantlifestyle.com", "realfarmacy.com", "realmomsrealreviews.com", "realtytoday.com", "redhotchacha.com", "redmaryland.com", "returnofkings.com", "rightwingnews.com", "robotics.news", "shark-tank.com", "shedthoselbs.com", "slender.news", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "stupid.news", "techconsumer.com", "techtimes.com", "theblacksphere.net", "theboredmind.com", "thefreethoughtproject.com", "thegatewaypundit.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "twisted.news", "usherald.com", "valuewalk.com", "vcpost.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "wakingtimes.com", "winningdemocrats.com", "xtribune.com", "youthhealthmag.com", NULL }; const char *dad8fc6d4[] = { "ca.weather.yahoo.com", NULL }; +const char *dad9b2a87[] = { "vercanalestv1.com", NULL }; const char *dad9b62ce[] = { "ftlauderdalewebcam.com", "nyharborwebcam.com", "portcanaveralwebcam.com", "portevergladeswebcam.com", "portmiamiwebcam.com", NULL }; const char *dadab6169[] = { "wired.com", NULL }; const char *dadc77a20[] = { "lazygamer.net", NULL }; @@ -52850,7 +52910,6 @@ const char *df8aa2ecf[] = { "avgle.com", "camwhorestv.org", "extremetube.com", " const char *df8b0c1b8[] = { "au.tv.yahoo.com", NULL }; const char *df900c4b [] = { "mashable.com", NULL }; const char *df908fd49[] = { "latimes.com", NULL }; -const char *df99aff14[] = { "activistpost.com", "addictinginfo.com", "alfonzorachel.com", "allenwestrepublic.com", "allthingsvegas.com", "americansublime.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bestfunnyjokes4u.com", "bighealthreport.com", "bipartisanreport.com", "breaking911.com", "breathecast.com", "bugout.news", "bulletsfirst.net", "celebrity-gossip.net", "clashdaily.com", "classicalite.com", "collapse.news", "comicallyincorrect.com", "conservativebyte.com", "conservativeintel.com", "conservativevideos.com", "constitution.com", "coviral.com", "craigjames.com", "creepybasement.com", "crossmap.com", "cyberwar.news", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "dccrimestories.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "evil.news", "fitnessconnoisseur.com", "foreverymom.com", "freedom.news", "freedomdaily.com", "freedomforce.com", "freedomoutpost.com", "freewarefiles.com", "gamerant.com", "girlsjustwannahaveguns.com", "godfatherpolitics.com", "groopspeak.com", "guardianlv.com", "guns.news", "gymflow100.com", "hallels.com", "hautereport.com", "healthstatus.com", "hispolitica.com", "hngn.com", "honesttopaws.com", "ifyouonlynews.com", "infowars.com", "instigatornews.com", "jobsnhire.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "liberty.news", "libertyalliance.com", "libertyunyielding.com", "lidblog.com", "medicine.news", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "natural.news", "naturalblaze.com", "naturalnews.com", "naturalsociety.com", "natureworldnews.com", "newser.com", "newseveryday.com", "newsthump.com", "oddee.com", "patriotoutdoornews.com", "patriottribune.com", "pickthebrain.com", "politicaloutcast.com", "politichicks.com", "practicallyviral.com", "quirlycues.com", "rantlifestyle.com", "realfarmacy.com", "realmomsrealreviews.com", "realtytoday.com", "redhotchacha.com", "redmaryland.com", "returnofkings.com", "robotics.news", "shark-tank.com", "shedthoselbs.com", "slender.news", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "stupid.news", "techconsumer.com", "techtimes.com", "theblacksphere.net", "thefreethoughtproject.com", "thegatewaypundit.com", "thehayride.com", "thelibertarianrepublic.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "twisted.news", "usherald.com", "valuewalk.com", "vcpost.com", "vgpie.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "wakingtimes.com", "wnd.com", "xtribune.com", "youthhealthmag.com", NULL }; const char *df9b5af3e[] = { "tv3.ie", NULL }; const char *df9f0a9b2[] = { "horny.net", "xmatch.com", NULL }; const char *dfa0c9f7f[] = { "extremetube.com", "spankwire.com", NULL }; @@ -52989,7 +53048,6 @@ const char *dn6c073fbe[] = { "worth1000.com.ip", NULL }; const char *dn6e601e75[] = { "adlabs.ru", NULL }; const char *dn6eed60d0[] = { "ad6media.fr", NULL }; const char *dn6fc30b36[] = { "inad.com", "inad.info", NULL }; -const char *dn7002da25[] = { "adpop.me", NULL }; const char *dn7004f3e [] = { "smartadserver.com", "smartadserver.com.br", "smartadserver.de", "smartadserver.es", "smartadserver.fr", "smartadserver.it", "smartadserver.pl", "smartadserver.ru", NULL }; const char *dn702542c8[] = { "utm.edu", "utm.md", "utoronto.ca", NULL }; const char *dn706d9b2e[] = { "adsearch.fr", NULL }; @@ -53015,7 +53073,6 @@ const char *dn8002a1d9[] = { "trueswords.com.ip", NULL }; const char *dn804482f2[] = { "gaytube.com", "pornhub.com", "redtube.com", "redtube.com.br", "tube8.com", "tube8.es", "tube8.fr", "xtube.com", "youjizz.com", "youporn.com", "youporngay.com", NULL }; const char *dn807dfc90[] = { "amazon.cdn.ip.seen.on.cheapflight", NULL }; const char *dn82a9b9f0[] = { "berlin-airport.de", NULL }; -const char *dn8672b95c[] = { "tools.wmflabs.org", NULL }; const char *dn8789aeca[] = { "koreatimes-kr.ip", NULL }; const char *dn87df3946[] = { "tvil.me", NULL }; const char *dn88bc18ef[] = { "statistik.lubw.baden-wuerttemberg.de.ip", NULL }; @@ -53031,6 +53088,7 @@ const char *dn8e68d090[] = { "gowatchit.com", NULL }; const char *dn9255832 [] = { "addisplay.ca", NULL }; const char *dn93a94d43[] = { "adnetwork.ie", "adnetwork.sk", NULL }; const char *dn93f89464[] = { "amazon.com", NULL }; +const char *dn94dc86d9[] = { "pagedemo.co", NULL }; const char *dn950ec14d[] = { "caixin.com.ip", NULL }; const char *dn97d7eca3[] = { "vereinslinie.de", NULL }; const char *dn97ddfa33[] = { "mail.yahoo.com", NULL }; @@ -53059,6 +53117,7 @@ const char *dnaa48262 [] = { "adcl.com", NULL }; const char *dnaa56271c[] = { "bannersnack.com", NULL }; const char *dnaabef048[] = { "koreaherald-com.ip", NULL }; const char *dnaac73b76[] = { "twitch.tv", NULL }; +const char *dnace2b00 [] = { "adpop.ro", "adpop.me", NULL }; const char *dnad65c43e[] = { "superfilm.pl", NULL }; const char *dnaea03069[] = { "adrobot.com.au", NULL }; const char *dnaebf9323[] = { "mrskincdn.com", NULL }; @@ -53097,6 +53156,7 @@ const char *dnc9d1da17[] = { "tritondigital.net.ip", NULL }; const char *dnc9e39a52[] = { "panel.rightflow.com", NULL }; const char *dncad54fef[] = { "microad.co.id", NULL }; const char *dncd0f7602[] = { "brewculture.com", NULL }; +const char *dncfd379b7[] = { "stats.wikimedia.org", "tools.wmflabs.org", NULL }; const char *dnd02bd5ff[] = { "zappistore.com", NULL }; const char *dnd08ab49b[] = { "adsimilate.ip", NULL }; const char *dnd0c2087a[] = { "linkedin.com", NULL }; @@ -55045,6 +55105,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m1b68dbb2, 0, NULL, NULL }, {m935f649b, 0, NULL, NULL }, {m893719d4, 0, NULL, NULL }, + {mcd33b349, 0, NULL, NULL }, {m4317adab, 0, NULL, NULL }, {m6bc4a0d2, 0, NULL, NULL }, {maebeeec8, 0, NULL, NULL }, @@ -57047,6 +57108,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m6853e1d5, 0, NULL, NULL }, {m54b16c14, 0, NULL, NULL }, {m1ece4af3, 0, NULL, NULL }, + {m12360fb4, 0, NULL, NULL }, {mcf11af0f, 0, NULL, NULL }, {m69a2bad6, 0, NULL, NULL }, {m61c77ad0, 0, NULL, NULL }, @@ -57425,6 +57487,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {md64a1171, 0, NULL, NULL }, {m1e421082, 0, NULL, NULL }, {m4d59e2c6, 0, NULL, NULL }, + {m119be2e, 0, NULL, NULL }, {m913c796, 0, NULL, NULL }, {mbe67a232, 0, NULL, NULL }, {md8d3866c, 0, NULL, NULL }, @@ -58560,7 +58623,9 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mc42e4600, 0, NULL, NULL }, {m6afb58fd, 0, NULL, NULL }, {m40f83ae7, 0, NULL, NULL }, + {me7fcbc6f, 0, NULL, NULL }, {m117a7a98, 0, NULL, NULL }, + {mee081f2f, 0, NULL, NULL }, {mff3f6077, 0, NULL, NULL }, {m7cd8eef2, 0, NULL, NULL }, {mf0d1fbf8, 0, NULL, NULL }, @@ -59063,6 +59128,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mbf555adb, 0, NULL, NULL }, {m453e2f5c, 0, NULL, NULL }, {m90023ac2, 0, NULL, NULL }, + {m9465a7ba, 0, NULL, NULL }, {ma5d72ca0, 0, NULL, NULL }, {m6a2f77ab, 0, NULL, NULL }, {mfc862c7b, 0, NULL, NULL }, @@ -59210,6 +59276,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mb57eddd4, 0, NULL, NULL }, {mf97b7749, 0, NULL, NULL }, {m2170ceb9, 0, NULL, NULL }, + {mba4185b9, 0, NULL, NULL }, {m895f9d6b, 0, NULL, dnbed14a52 }, {m715bcb9b, 0, NULL, dn7004f3e }, {m1e4e8f74, 0, NULL, NULL }, @@ -59766,6 +59833,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m5b79f32, 0, NULL, NULL }, {m540dde2, 0, NULL, NULL }, {m6f1beef7, 0, NULL, NULL }, + {ma7bca060, 0, NULL, NULL }, {m194e0148, 0, NULL, NULL }, {mc6265733, 0, NULL, NULL }, {m4b2bb128, 0, NULL, NULL }, @@ -59904,6 +59972,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {md80ed7c8, 0, NULL, NULL }, {meaa5e545, 0, NULL, NULL }, {mbd4ec4b4, 0, NULL, NULL }, + {meea547ce, 0, NULL, NULL }, {md9d82af6, 0, NULL, NULL }, {mc925a433, 0, NULL, NULL }, {mc283d97e, 0, NULL, NULL }, @@ -61396,6 +61465,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m77614a2a, 0, NULL, NULL }, {m80bd39d7, 0, NULL, NULL }, {m8d3178d2, 0, NULL, NULL }, + {m472b336e, 0, NULL, NULL }, {mdcd84485, 0, NULL, NULL }, {mb27ce5, 0, NULL, NULL }, {m2339b105, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, @@ -61626,6 +61696,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m456ae6b8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {me0b7762d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {me6da8c1c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m2f96c6b7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m38d14d6f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m957fd324, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m305ce68, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -61778,6 +61849,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mc2eb43dd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5d36098c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mb540bfbc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m1f3c8bbc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {meebfa9a9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m11ff6023, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mcbf06299, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -62193,6 +62265,12 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {md2a2a35d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m40d4aee, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m88118c30, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m8c321386, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m3976fd09, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m3b38421c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mba00c29f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m364f0952, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {meae80f15, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m38ad738b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m8ffb4e68, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mba70563e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -62435,6 +62513,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {maf816867, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md5698bb3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mf3a5c67d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m31604763, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mcd242bfc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mca059a00, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m8f44e161, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -62825,6 +62904,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m5eedad43, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mcfd1060a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m8727892c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {ma5f264b4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1bd17fac, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mdf3612, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m84a4a936, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -65211,6 +65291,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {ma047920b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mef9199f8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m2fdb5f00, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mc01ab553, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m20b77844, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mdd3e99b0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m4ef1bf21, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67300,12 +67381,22 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m4c0c7163, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc696038, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m340f1275, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m7a92fef3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m3c118123, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {meab001a7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m3a4c708b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m12229eaa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m93173622, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m905a6521, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m37a5e790, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m7a05270a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m5575232a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m4c67cae8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {ma39ec6b3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m1ba8db02, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mf6a16644, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m7ffb3329, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m18202baf, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m66d80875, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m65eecbf2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mcb391da2, ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -72481,6 +72572,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m46646ee1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1673b273, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {meaf92400, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m88d9ae0a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m3d3c1d12, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m60398d6d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5f4cc9a3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -77254,6 +77346,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {ma98c3f22, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {me4f5b2bb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m6565d8dc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m6ee8901e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m1baea16e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mb721395f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m81b0d9a3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -81650,7 +81743,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m7e9ae777, ADBLOCK_FLAG_MATCH_DOMAIN, d403f597f, NULL }, {mcceb3de9, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mf135a657, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {m624e1093, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d2344d5f0, NULL }, {m21a35206, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, da54ca9e9, NULL }, {mf3422bd5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, d403f597f, NULL }, {m42c59d71, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, @@ -81918,7 +82010,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mcef2fc73, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {me0c3b15c, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m126622b6, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {mdf0d8d98, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {me02bb9c4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m7811d5f1, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m28025172, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -83753,8 +83844,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {maf4f8b94, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, d544f543f, NULL }, {macf1d3ae, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, d98576519, NULL }, {m5b0a0388, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, d992a21d8, NULL }, - {mc00f1e0f, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, df99aff14, NULL }, - {m6b40fc66, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, d1d9deb1e, NULL }, + {mc00f1e0f, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, d4d1f93b6, NULL }, + {m6b40fc66, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, d434fc682, NULL }, {m617d0c96, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, de867256e, NULL }, {mfcd3ea66, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, d70569de8, NULL }, {m8ad1de74, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, df6efc399, NULL }, @@ -88192,6 +88283,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m824a75d9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m55fe590b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, d31378d3b, NULL }, {m1a817167, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, + {m32f90de2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc406ddcf, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, d2406de0c, NULL }, {m2c3de0fe, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m9f8effdf, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, @@ -88276,7 +88368,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m88118c30, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mb83cb4f0, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m2084ce4b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, - {m3f03c8b8, 0, NULL, dn7002da25 }, + {m3f03c8b8, 0, NULL, dnace2b00 }, {mf5b57476, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m25ccf618, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {mc618bdf2, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d5d437ba3, NULL }, @@ -88303,6 +88395,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mdb9831b7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {m6ad94daa, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m582c8bad, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d143d3e80, NULL }, + {m624e1093, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, dad9b2a87, NULL }, {mef98b53, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mb4658715, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m947c91ff, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -88393,6 +88486,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {ma30e0437, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mf71f7945, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, db0ddb6a9, NULL }, {m2674122, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, + {mb1a69ac6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5d5d5ca2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5ec4a21a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m51dfc65b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -88424,7 +88518,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m996c37d9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m3bbdcb3e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {me86b6221, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {m576c48f5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m35288536, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mb3ce74, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mbc001e49, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m1821bf97, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, @@ -88479,6 +88573,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mc0796670, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {md8831ebb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {m7ad06033, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mf161c40b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m7b3708af, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mb83635a7, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m64f490ab, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -88558,6 +88653,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m480a1f0f, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {mbdfd5ddc, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {mb82b6e67, 0, NULL, NULL }, + {mb4a2b45c, 0, NULL, NULL }, {m75d9aad8, 0, NULL, NULL }, {mf0c32782, 0, NULL, NULL }, {m729f8dd4, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, @@ -90379,6 +90475,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m9a724a58, 0, NULL, NULL }, {maef8144a, 0, NULL, NULL }, {mb7ea984d, 0, NULL, NULL }, + {m5175733b, 0, NULL, NULL }, {mdce10d52, 0, NULL, NULL }, {m528b9021, 0, NULL, NULL }, {m8a9af1e3, 0, NULL, NULL }, @@ -90592,6 +90689,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mece2fb7e, 0, NULL, NULL }, {m1208e119, 0, NULL, NULL }, {md1932333, 0, NULL, NULL }, + {m6cd188e3, 0, NULL, NULL }, {m7f0542ce, 0, NULL, NULL }, {md7ca25e7, 0, NULL, NULL }, {ma106c858, 0, NULL, NULL }, @@ -90860,7 +90958,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m9bd1ad45, 0, NULL, NULL }, {m31147ac5, 0, NULL, NULL }, {m9d9a1b66, 0, NULL, NULL }, - {mc6987c96, 0, NULL, dn8672b95c }, + {mc6987c96, 0, NULL, dncfd379b7 }, {m72ce7482, 0, NULL, NULL }, {m66e02cf0, 0, NULL, NULL }, {mcfb21ddb, 0, NULL, NULL }, @@ -91147,6 +91245,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {ma3d62fef, 0, NULL, NULL }, {m11e8dfb2, 0, NULL, NULL }, {m1cc13d24, 0, NULL, NULL }, + {mf33e29ff, 0, NULL, NULL }, {mcf8dc201, 0, NULL, NULL }, {md622f870, 0, NULL, NULL }, {mad1ce84c, 0, NULL, NULL }, @@ -91180,6 +91279,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mc749374b, 0, NULL, NULL }, {m40b2dd9b, 0, NULL, NULL }, {ma59d8b7f, 0, NULL, NULL }, + {m540eafa0, 0, NULL, NULL }, {m31d32a05, 0, NULL, NULL }, {m204a29f6, 0, NULL, NULL }, {me9ae1533, 0, NULL, NULL }, @@ -91571,6 +91671,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {ma0479739, 0, NULL, NULL }, {mb6d3086d, 0, NULL, NULL }, {mdf5c2eed, 0, NULL, NULL }, + {m2c614c51, 0, NULL, NULL }, {m2f9ef1d9, 0, NULL, NULL }, {m68205d1f, 0, NULL, NULL }, {md2f7cb4, 0, NULL, NULL }, @@ -91628,6 +91729,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mb00c2358, 0, NULL, NULL }, {mc9fc0c64, 0, NULL, NULL }, {m3058c725, 0, NULL, NULL }, + {m753af591, 0, NULL, NULL }, {m94e1027a, 0, NULL, NULL }, {ma61ee452, 0, NULL, NULL }, {mf3e95e10, 0, NULL, NULL }, @@ -92090,6 +92192,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {me4122329, 0, NULL, NULL }, {mdefe3664, 0, NULL, NULL }, {m532e0f89, 0, NULL, NULL }, + {md0ef68fe, 0, NULL, NULL }, {me5022cea, 0, NULL, NULL }, {m9c7bfdb5, 0, NULL, NULL }, {m5a17c158, 0, NULL, NULL }, @@ -92308,6 +92411,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m58c27290, 0, NULL, NULL }, {m36ab4f2a, 0, NULL, NULL }, {m79fae69a, 0, NULL, NULL }, + {mcef7691, 0, NULL, NULL }, {mfde0a62, 0, NULL, NULL }, {m10c024e4, 0, NULL, NULL }, {m377178c1, 0, NULL, NULL }, @@ -92364,6 +92468,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m99447aca, 0, NULL, NULL }, {m502349e3, 0, NULL, NULL }, {meed735fa, 0, NULL, NULL }, + {mb358ffb2, 0, NULL, NULL }, {mace6d69c, 0, NULL, NULL }, {m5aa6af83, 0, NULL, NULL }, {md8ec5d28, 0, NULL, NULL }, @@ -92826,6 +92931,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mbca1d12a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mae7bfee, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m89c3ac14, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {ma3336e64, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m8869f24d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m66cc1400, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mef408e55, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -93547,6 +93653,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m7edfe2ad, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mbccf04d1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {ma7d8507e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {madb8eebe, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md6e9b1d8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mb21a762d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1918977, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -93599,7 +93706,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mb88da3ed, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m31db8045, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m2a3cf2cf, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, - {m1364bee0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m1364bee0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, dn94dc86d9 }, {maf61f994, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mb2c054d9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m94270130, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -93790,6 +93897,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m286674, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5d54afff, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mfca0387, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m625fa870, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mf8c641a9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mabc54ad2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc137869f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1a114345, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -95981,10 +96090,13 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m5ab79b18, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m8e7972fb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m52f313f5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mecaea957, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m4f416b14, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc4e3d16, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m91e05e6e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m895f2466, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6124d08d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m633d596c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mea1b3fd3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m24eb46ed, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m89a1df2e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -96460,6 +96572,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mde823f7d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mf6d74a10, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m238b1af2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {md11742b4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {me23e025a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m2a50de32, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mf3b6a3c1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -96707,6 +96820,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m451563b3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m87a0e3a3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m12d7f5f0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m495b1ea0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m1ff05e3e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m713e4380, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m2b42d504, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -97162,6 +97276,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m7ec22806, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5448aca4, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mf0becfe8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m55504c0c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mdf9bde3a, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m6593c7d3, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mf9f8ea75, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -97179,6 +97294,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m608417bd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m592cdf3a, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m90ec56de, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m69506f1a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m3a6b64bb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m95cc85e5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m1ccc167d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -97576,7 +97692,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mb6354fd1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m9c7c8690, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m94969f8e, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {m2905b311, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, + {m1a0011ad, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {m818f1c84, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m2a5a2ac9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m748791a0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -98685,6 +98801,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m1b76521e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m75806ba5, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m9f7fe9a5, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {mbd5cca29, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m9049e3ae, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m2b5989c6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m46534b63, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -99748,6 +99865,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {md2fc436, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mff81322e, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m4660554b, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {m28866806, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m9c1ce004, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m527bdf73, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mb9b50794, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -100989,6 +101107,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {me381ef42, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m5c0f4511, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {ma45c7a03, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {m6a557553, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m6f8b3625, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m6994adb2, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m78b94003, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, diff --git a/patches/BRM049_Bromite-adblock-engine.patch b/patches/BRM049_Bromite-adblock-engine.patch index 4c58126e..11a3ed86 100644 --- a/patches/BRM049_Bromite-adblock-engine.patch +++ b/patches/BRM049_Bromite-adblock-engine.patch @@ -22,12 +22,12 @@ Perform adblock interception in StartJob to address lagging issues .../java/strings/android_chrome_strings.grd | 11 + .../subresource_filter_content_settings_manager.cc | 3 + net/BUILD.gn | 9 +- - net/url_request/adblock_intercept.cc | 329 +++++++++++++++++++++ + net/url_request/adblock_intercept.cc | 326 +++++++++++++++++++++ net/url_request/adblock_intercept.h | 18 ++ net/url_request/nochromo_intercept.cc | 116 -------- net/url_request/nochromo_intercept.h | 13 - net/url_request/url_request.cc | 36 ++- - 14 files changed, 480 insertions(+), 134 deletions(-) + 14 files changed, 477 insertions(+), 134 deletions(-) create mode 100644 net/url_request/adblock_intercept.cc create mode 100644 net/url_request/adblock_intercept.h delete mode 100644 net/url_request/nochromo_intercept.cc @@ -251,7 +251,7 @@ diff --git a/net/url_request/adblock_intercept.cc b/net/url_request/adblock_inte new file mode 100644 --- /dev/null +++ b/net/url_request/adblock_intercept.cc -@@ -0,0 +1,329 @@ +@@ -0,0 +1,326 @@ +#include "url/gurl.h" + +#ifdef ADB_TESTER @@ -431,69 +431,69 @@ new file mode 100644 + return match; +} + -+static int url_match_domain(adblock_entry *entry, const std::string &origin_host) { -+ if (entry->domains_skip && !origin_host.empty()) { -+ // filter will not be activated on these domains ++bool url_match_domain(adblock_entry *entry, const std::string &origin_host) { ++ bool match_domain = true; ++ // check for a negative domain match ++ if (entry->domains_skip) { ++ if (origin_host.empty()) { ++ // skip this rule, cannot match on domain ++ return false; ++ } + for (int d = 0; const char *domain = entry->domains_skip[d]; d++) { + if (domain == origin_host) { -+ // this domain is whitelisted, do not further process this rule in any way -+ return 0; ++ match_domain = false; ++ break; + } + } + } -+ // fallthrough is desired + -+ if (!entry->domains || origin_host.empty()) { -+ // undetermined -+ return 3; -+ } -+ -+ // filter will be active only if a domain matches -+ // if none matches, the filter is to be skipped -+ for (int d = 0; const char *domain = entry->domains[d]; d++) { -+ if (domain == origin_host) { -+ // this domain is one of those that activate the rule -+ return 1; ++ // check for a required positive domain match ++ if (entry->domains) { ++ if (origin_host.empty()) { ++ // skip this rule, cannot match on domain ++ return false; ++ } ++ for (int d = 0; const char *domain = entry->domains[d]; d++) { ++ if (domain != origin_host) { ++ match_domain = false; ++ break; ++ } + } + } -+ -+ // at least one domain should have been found, but none was -+ // thus the filter must be skipped -+ return 0; ++ return match_domain; +} + -+static int url_match_party(adblock_entry *entry, const GURL &url, -+ const std::string &origin_host, int &fp) { -+ int desired_fp; ++static bool url_match_party(adblock_entry *entry, const GURL &url, ++ const std::string &origin_host, bool &checked_fp, ++ bool &fp) { ++ bool wanted_fp; + if ((entry->flags & ADBLOCK_FLAG_THIRD_PARTY) != 0) { -+ desired_fp = 0; ++ wanted_fp = false; + } else if ((entry->flags & ADBLOCK_FLAG_FIRST_PARTY) != 0) { -+ desired_fp = 1; ++ wanted_fp = true; + } else { -+ // undetermined, it does not test for first/third party -+ return 3; ++ // no-op ++ return true; + } + + if (origin_host.empty()) { + // cannot match this rule, no origin host to determine first/third party -+ return 0; ++ return false; + } + +#ifdef ADB_TESTER +//__android_log_print(ANDROID_LOG_INFO, LOG_TAG, "matchFirst=%d matchThird=%d", +// matchFirstParty, matchThirdParty); +#endif -+ if (fp == 3) { ++ if (!checked_fp) { + // lower-case version + char *l_host = strtolower(origin_host.c_str()), + *l_url_host = strtolower(url.host().c_str()); + + // is the URL a first-party to the current page's host? -+ if (is_first_party(l_host, l_url_host)) -+ fp = 1; -+ else -+ fp = 0; ++ fp = is_first_party(l_host, l_url_host); + ++ checked_fp = true; +#ifdef ADB_TESTER + __android_log_print(ANDROID_LOG_INFO, LOG_TAG, + "is_first_party(\"%s\", \"%s\") = %s", l_host, @@ -503,7 +503,7 @@ new file mode 100644 + free(l_url_host); + } + -+ return fp == desired_fp ? 1 : 0; ++ return fp == wanted_fp; +} + +int adblock_intercept(const GURL &url, const std::string &origin_host) { @@ -522,7 +522,7 @@ new file mode 100644 + c_url, url.host().c_str(), origin_host.c_str()); +#endif + -+ int fp = 3; ++ bool checked_fp = false, fp = false; + + bool intercept = false; + for (int i = 0; i < ADBLOCK_ENTRY_COUNT; i++) { @@ -532,22 +532,19 @@ new file mode 100644 + bool check = + (!intercept && ((entry->flags & ADBLOCK_FLAG_EXCEPTION) == 0)) || + (intercept && ((entry->flags & ADBLOCK_FLAG_EXCEPTION) != 0)); -+ + if (!check) + continue; + + // first check for domain matches, a quick branch out if matching -+ if (0 == url_match_domain(entry, origin_host)) { ++ if (!url_match_domain(entry, origin_host)) + continue; -+ } -+ // fallthrough with values 3 (undetermined / no domain options) or 1 (matched) + + // check on the URL matcher + if (!url_matches(c_url, c_url_sep, c_url_lower, c_url_lower_sep, entry)) + continue; + + // finally check first/third-party -+ if (0 == url_match_party(entry, url, origin_host, fp)) ++ if (!url_match_party(entry, url, origin_host, checked_fp, fp)) + continue; + +#ifdef ADBLOCK_LOG @@ -569,12 +566,12 @@ new file mode 100644 + + if (intercept) { +#ifdef ADBLOCK_LOG -+ __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "blocked (fp=%d)", fp); ++ __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "blocked"); +#endif + return 1; + } +#ifdef ADBLOCK_LOG -+ __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "pass (fp=%d)", fp); ++ __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "pass"); +#endif + } + return 0; diff --git a/patches/BRM059_Add-flag-to-show-hide-NTP-tiles.patch b/patches/BRM059_Add-flag-to-show-hide-NTP-tiles.patch index e2c1df6d..4f42bee7 100644 --- a/patches/BRM059_Add-flag-to-show-hide-NTP-tiles.patch +++ b/patches/BRM059_Add-flag-to-show-hide-NTP-tiles.patch @@ -14,17 +14,17 @@ Subject: Add flag to show/hide NTP tiles diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -1285,6 +1285,10 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kWebrtcNewEncodeCpuLoadEstimatorDescription, kOsAll, - FEATURE_VALUE_TYPE(media::kNewEncodeCpuLoadEstimator)}, - #if defined(OS_ANDROID) +@@ -1916,6 +1916,10 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kChromeModernAlternateCardLayoutName, + flag_descriptions::kChromeModernAlternateCardLayoutDescription, kOsAndroid, + FEATURE_VALUE_TYPE(chrome::android::kChromeModernAlternateCardLayout)}, + {"hide-ntp-tiles", + flag_descriptions::kHideNTPTilesName, + flag_descriptions::kHideNTPTilesDescription, kOsAndroid, + SINGLE_VALUE_TYPE(switches::kHideNTPTiles)}, - {"clear-old-browsing-data", flag_descriptions::kClearOldBrowsingDataName, - flag_descriptions::kClearOldBrowsingDataDescription, kOsAndroid, - FEATURE_VALUE_TYPE(features::kClearOldBrowsingData)}, + {"force-enable-home-page-button", flag_descriptions::kHomePageButtonName, + flag_descriptions::kHomePageButtonDescription, kOsAndroid, + FEATURE_VALUE_TYPE(chrome::android::kHomePageButtonForceEnabled)}, diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/browser/android/ntp/most_visited_sites_bridge.cc --- a/chrome/browser/android/ntp/most_visited_sites_bridge.cc +++ b/chrome/browser/android/ntp/most_visited_sites_bridge.cc diff --git a/patches/BRM060_Add-flag-to-disable-custom-tab-intents.patch b/patches/BRM060_Add-flag-to-disable-custom-tab-intents.patch index 4527e069..c78444ed 100644 --- a/patches/BRM060_Add-flag-to-disable-custom-tab-intents.patch +++ b/patches/BRM060_Add-flag-to-disable-custom-tab-intents.patch @@ -50,7 +50,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -1302,6 +1302,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1298,6 +1298,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kMediaScreenCaptureName, flag_descriptions::kMediaScreenCaptureDescription, kOsAndroid, FEATURE_VALUE_TYPE(chrome::android::kUserMediaScreenCapturing)}, diff --git a/patches/BRM063_Add-export-button-to-Bookmarks-activity-page.patch b/patches/BRM063_Add-export-button-to-Bookmarks-activity-page.patch new file mode 100644 index 00000000..aa7bcf1e --- /dev/null +++ b/patches/BRM063_Add-export-button-to-Bookmarks-activity-page.patch @@ -0,0 +1,210 @@ +From: csagan5 <32685696+csagan5@users.noreply.github.com> +Date: Wed, 1 Aug 2018 09:19:40 +0200 +Subject: Add export button to Bookmarks activity page + +--- + chrome/android/java/res/menu/bookmark_action_bar_menu.xml | 7 +++++++ + .../chrome/browser/bookmarks/BookmarkActionBar.java | 6 ++++++ + .../chromium/chrome/browser/bookmarks/BookmarkBridge.java | 10 ++++++++++ + .../chromium/chrome/browser/bookmarks/BookmarkDelegate.java | 5 +++++ + .../chromium/chrome/browser/bookmarks/BookmarkManager.java | 5 +++++ + chrome/android/java/strings/android_chrome_strings.grd | 3 +++ + chrome/browser/BUILD.gn | 4 ++-- + chrome/browser/android/bookmarks/bookmark_bridge.cc | 13 +++++++++++++ + chrome/browser/android/bookmarks/bookmark_bridge.h | 3 +++ + 9 files changed, 54 insertions(+), 2 deletions(-) + +diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml +--- a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml ++++ b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml +@@ -15,6 +15,13 @@ + app:showAsAction="ifRoom" + app:iconTint="@color/dark_mode_tint" /> + ++ + } else if (menuItem.getItemId() == R.id.search_menu_id) { + mDelegate.openSearchUI(); + return true; ++ } else if (menuItem.getItemId() == R.id.export_menu_id) { ++ mDelegate.exportBookmarks(); ++ return true; + } + + SelectionDelegate selectionDelegate = mDelegate.getSelectionDelegate(); +@@ -125,6 +128,7 @@ public class BookmarkActionBar extends SelectableListToolbar + void showLoadingUi() { + setTitle(null); + setNavigationButton(NAVIGATION_BUTTON_NONE); ++ getMenu().findItem(R.id.export_menu_id).setVisible(false); + getMenu().findItem(R.id.search_menu_id).setVisible(false); + getMenu().findItem(R.id.edit_menu_id).setVisible(false); + } +@@ -134,6 +138,7 @@ public class BookmarkActionBar extends SelectableListToolbar + super.showNormalView(); + + if (mDelegate == null) { ++ getMenu().findItem(R.id.export_menu_id).setVisible(false); + getMenu().findItem(R.id.search_menu_id).setVisible(false); + getMenu().findItem(R.id.edit_menu_id).setVisible(false); + } +@@ -166,6 +171,7 @@ public class BookmarkActionBar extends SelectableListToolbar + public void onFolderStateSet(BookmarkId folder) { + mCurrentFolder = mDelegate.getModel().getBookmarkById(folder); + ++ getMenu().findItem(R.id.export_menu_id).setVisible(true); + getMenu().findItem(R.id.search_menu_id).setVisible(true); + getMenu().findItem(R.id.edit_menu_id).setVisible(mCurrentFolder.isEditable()); + +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java +@@ -508,6 +508,15 @@ public class BookmarkBridge { + } + + /** ++ * Export bookmarks to the specified path. ++ * @param path The path of the bookmarks HTML export. ++ */ ++ public void exportBookmarks() { ++ assert mIsNativeBookmarkModelLoaded; ++ nativeExportBookmarks(mNativeBookmarkBridge); ++ } ++ ++ /** + * Synchronously gets a list of bookmarks that match the specified search query. + * @param query Keyword used for searching bookmarks. + * @param maxNumberOfResult Maximum number of result to fetch. +@@ -906,6 +915,7 @@ public class BookmarkBridge { + boolean getFolders, boolean getBookmarks, List bookmarksList); + private native BookmarkId nativeGetChildAt(long nativeBookmarkBridge, long id, int type, + int index); ++ private native void nativeExportBookmarks(long nativeBookmarkBridge); + private native int nativeGetTotalBookmarkCount(long nativeBookmarkBridge, long id, int type); + private native void nativeSetBookmarkTitle(long nativeBookmarkBridge, long id, int type, + String title); +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java +@@ -69,6 +69,11 @@ interface BookmarkDelegate { + void openSearchUI(); + + /** ++ * Exports the bookmarks. ++ */ ++ void exportBookmarks(); ++ ++ /** + * Dismisses the search UI. + */ + void closeSearchUI(); +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java +@@ -416,6 +416,11 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate, + } + + @Override ++ public void exportBookmarks() { ++ mBookmarkModel.exportBookmarks(); ++ } ++ ++ @Override + public void openSearchUI() { + setState(BookmarkUIState.createSearchState()); + mSelectableListLayout.onStartSearch(); +diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd +--- a/chrome/android/java/strings/android_chrome_strings.grd ++++ b/chrome/android/java/strings/android_chrome_strings.grd +@@ -209,6 +209,9 @@ CHAR-LIMIT guidelines: + + Search + ++ ++ Export ++ + + Show Info + +diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn +--- a/chrome/browser/BUILD.gn ++++ b/chrome/browser/BUILD.gn +@@ -1881,6 +1881,8 @@ jumbo_split_static_library("browser") { + if (is_android) { + sources += [ + "after_startup_task_utils_android.cc", ++ "bookmarks/bookmark_html_writer.cc", ++ "bookmarks/bookmark_html_writer.h", + "android/accessibility/font_size_prefs_android.cc", + "android/accessibility/font_size_prefs_android.h", + "android/android_theme_resources.h", +@@ -2422,8 +2424,6 @@ jumbo_split_static_library("browser") { + "banners/app_banner_infobar_delegate_desktop.h", + "banners/app_banner_manager_desktop.cc", + "banners/app_banner_manager_desktop.h", +- "bookmarks/bookmark_html_writer.cc", +- "bookmarks/bookmark_html_writer.h", + "certificate_viewer.h", + "chrome_browser_field_trials_desktop.cc", + "chrome_browser_field_trials_desktop.h", +diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browser/android/bookmarks/bookmark_bridge.cc +--- a/chrome/browser/android/bookmarks/bookmark_bridge.cc ++++ b/chrome/browser/android/bookmarks/bookmark_bridge.cc +@@ -11,9 +11,11 @@ + + #include "base/android/jni_array.h" + #include "base/android/jni_string.h" ++#include "base/android/path_utils.h" + #include "base/containers/stack.h" + #include "base/containers/stack_container.h" + #include "base/i18n/string_compare.h" ++#include "chrome/browser/bookmarks/bookmark_html_writer.h" + #include "chrome/browser/bookmarks/bookmark_model_factory.h" + #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" + #include "chrome/browser/profiles/incognito_helpers.h" +@@ -470,6 +472,17 @@ jint BookmarkBridge::GetTotalBookmarkCount( + return count; + } + ++void BookmarkBridge::ExportBookmarks(JNIEnv* env, ++ const JavaParamRef& obj) { ++ DCHECK(IsLoaded()); ++ base::FilePath path; ++ if (!base::android::GetDownloadsDirectory(&path)) { ++ return; ++ } ++ ++ bookmark_html_writer::WriteBookmarks(profile_, path.Append(FILE_PATH_LITERAL("bookmarks.html")), NULL); ++} ++ + void BookmarkBridge::SetBookmarkTitle(JNIEnv* env, + const JavaParamRef& obj, + jlong id, +diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser/android/bookmarks/bookmark_bridge.h +--- a/chrome/browser/android/bookmarks/bookmark_bridge.h ++++ b/chrome/browser/android/bookmarks/bookmark_bridge.h +@@ -116,6 +116,9 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, + jlong id, + jint type); + ++ void ExportBookmarks(JNIEnv* env, ++ const base::android::JavaParamRef& obj); ++ + void SetBookmarkTitle(JNIEnv* env, + const base::android::JavaParamRef& obj, + jlong id, +-- +2.7.4 + diff --git a/patches/BRM063_Disable-fetching-of-all-field-trials.patch b/patches/BRM064_Disable-fetching-of-all-field-trials.patch similarity index 100% rename from patches/BRM063_Disable-fetching-of-all-field-trials.patch rename to patches/BRM064_Disable-fetching-of-all-field-trials.patch diff --git a/patches/BRM064_Disable-smooth-scrolling-on-Linux.patch b/patches/BRM065_Disable-smooth-scrolling-on-Linux.patch similarity index 100% rename from patches/BRM064_Disable-smooth-scrolling-on-Linux.patch rename to patches/BRM065_Disable-smooth-scrolling-on-Linux.patch diff --git a/patches/BRM065_Disable-plugins-enumeration.patch b/patches/BRM066_Disable-plugins-enumeration.patch similarity index 100% rename from patches/BRM065_Disable-plugins-enumeration.patch rename to patches/BRM066_Disable-plugins-enumeration.patch diff --git a/patches/BRM066_Remove-google-account-access-permission-on-reboot.patch b/patches/BRM067_Remove-google-account-access-permission-on-reboot.patch similarity index 100% rename from patches/BRM066_Remove-google-account-access-permission-on-reboot.patch rename to patches/BRM067_Remove-google-account-access-permission-on-reboot.patch diff --git a/patches/BRM067_net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch b/patches/BRM068_net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch similarity index 100% rename from patches/BRM067_net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch rename to patches/BRM068_net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch diff --git a/patches/BRM068_dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather-than-Google.patch b/patches/BRM069_dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather-than-Google.patch similarity index 100% rename from patches/BRM068_dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather-than-Google.patch rename to patches/BRM069_dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather-than-Google.patch diff --git a/patches/BRM069_profile-resetter-do-not-tick-send-settings-by-default.patch b/patches/BRM070_profile-resetter-do-not-tick-send-settings-by-default.patch similarity index 100% rename from patches/BRM069_profile-resetter-do-not-tick-send-settings-by-default.patch rename to patches/BRM070_profile-resetter-do-not-tick-send-settings-by-default.patch diff --git a/patches/BRM070_browser-ui-disable-warning-about-missing-API-keys.patch b/patches/BRM071_browser-ui-disable-warning-about-missing-API-keys.patch similarity index 100% rename from patches/BRM070_browser-ui-disable-warning-about-missing-API-keys.patch rename to patches/BRM071_browser-ui-disable-warning-about-missing-API-keys.patch diff --git a/patches/BRM071_autofill-disable-autofill-download-manager.patch b/patches/BRM072_autofill-disable-autofill-download-manager.patch similarity index 100% rename from patches/BRM071_autofill-disable-autofill-download-manager.patch rename to patches/BRM072_autofill-disable-autofill-download-manager.patch diff --git a/patches/BRM072_first_run-deactivate-autoupdate-globally.patch b/patches/BRM073_first_run-deactivate-autoupdate-globally.patch similarity index 100% rename from patches/BRM072_first_run-deactivate-autoupdate-globally.patch rename to patches/BRM073_first_run-deactivate-autoupdate-globally.patch diff --git a/patches/BRM073_safe_browsing-disable-incident-reporting.patch b/patches/BRM074_safe_browsing-disable-incident-reporting.patch similarity index 100% rename from patches/BRM073_safe_browsing-disable-incident-reporting.patch rename to patches/BRM074_safe_browsing-disable-incident-reporting.patch diff --git a/patches/BRM074_safe_browsing-disable-reporting-of-safebrowsing-override.patch b/patches/BRM075_safe_browsing-disable-reporting-of-safebrowsing-override.patch similarity index 100% rename from patches/BRM074_safe_browsing-disable-reporting-of-safebrowsing-override.patch rename to patches/BRM075_safe_browsing-disable-reporting-of-safebrowsing-override.patch diff --git a/patches/BRM075_safe_browsing-disable-cookie-transmission.patch b/patches/BRM076_safe_browsing-disable-cookie-transmission.patch similarity index 100% rename from patches/BRM075_safe_browsing-disable-cookie-transmission.patch rename to patches/BRM076_safe_browsing-disable-cookie-transmission.patch diff --git a/patches/BRM076_extensions-always-show-component-extensions-in-the-ext-list.patch b/patches/BRM077_extensions-always-show-component-extensions-in-the-ext-list.patch similarity index 100% rename from patches/BRM076_extensions-always-show-component-extensions-in-the-ext-list.patch rename to patches/BRM077_extensions-always-show-component-extensions-in-the-ext-list.patch diff --git a/patches/BRM077_translate-disable-fetching-of-translate-languages-from-server.patch b/patches/BRM078_translate-disable-fetching-of-translate-languages-from-server.patch similarity index 100% rename from patches/BRM077_translate-disable-fetching-of-translate-languages-from-server.patch rename to patches/BRM078_translate-disable-fetching-of-translate-languages-from-server.patch diff --git a/patches/BRM078_lint-suppress-hardcoded-text-warnings.patch b/patches/BRM079_lint-suppress-hardcoded-text-warnings.patch similarity index 100% rename from patches/BRM078_lint-suppress-hardcoded-text-warnings.patch rename to patches/BRM079_lint-suppress-hardcoded-text-warnings.patch diff --git a/patches/BRM079_kill-Vision.patch b/patches/BRM080_kill-Vision.patch similarity index 100% rename from patches/BRM079_kill-Vision.patch rename to patches/BRM080_kill-Vision.patch diff --git a/patches/BRM080_kill-GCM.patch b/patches/BRM081_kill-GCM.patch similarity index 100% rename from patches/BRM080_kill-GCM.patch rename to patches/BRM081_kill-GCM.patch diff --git a/patches/BRM081_kill-Auth.patch b/patches/BRM082_kill-Auth.patch similarity index 100% rename from patches/BRM081_kill-Auth.patch rename to patches/BRM082_kill-Auth.patch diff --git a/patches/BRM082_kill-remaining-Play-Services-checks.patch b/patches/BRM083_kill-remaining-Play-Services-checks.patch similarity index 100% rename from patches/BRM082_kill-remaining-Play-Services-checks.patch rename to patches/BRM083_kill-remaining-Play-Services-checks.patch diff --git a/patches/BRM083_kill-TOS-and-metrics-opt-out.patch b/patches/BRM084_kill-TOS-and-metrics-opt-out.patch similarity index 100% rename from patches/BRM083_kill-TOS-and-metrics-opt-out.patch rename to patches/BRM084_kill-TOS-and-metrics-opt-out.patch diff --git a/patches/BRM084_kill-Translate-doesn-t-work.patch b/patches/BRM085_kill-Translate-doesn-t-work.patch similarity index 100% rename from patches/BRM084_kill-Translate-doesn-t-work.patch rename to patches/BRM085_kill-Translate-doesn-t-work.patch diff --git a/patches/BRM086_Fixup-build-also-html-reader-for-bookmark-imports.patch b/patches/BRM086_Fixup-build-also-html-reader-for-bookmark-imports.patch new file mode 100644 index 00000000..7e520929 --- /dev/null +++ b/patches/BRM086_Fixup-build-also-html-reader-for-bookmark-imports.patch @@ -0,0 +1,57 @@ +From: csagan5 <32685696+csagan5@users.noreply.github.com> +Date: Thu, 2 Aug 2018 00:40:23 +0200 +Subject: Fixup: build also html reader for bookmark imports + +--- + chrome/browser/BUILD.gn | 4 ++-- + chrome/utility/BUILD.gn | 7 +++++-- + 2 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn +--- a/chrome/browser/BUILD.gn ++++ b/chrome/browser/BUILD.gn +@@ -136,6 +136,8 @@ jumbo_split_static_library("browser") { + "bitmap_fetcher/bitmap_fetcher_service.h", + "bitmap_fetcher/bitmap_fetcher_service_factory.cc", + "bitmap_fetcher/bitmap_fetcher_service_factory.h", ++ "bookmarks/bookmark_html_writer.cc", ++ "bookmarks/bookmark_html_writer.h", + "bookmarks/bookmark_model_factory.cc", + "bookmarks/bookmark_model_factory.h", + "bookmarks/bookmark_stats.cc", +@@ -1857,8 +1859,6 @@ jumbo_split_static_library("browser") { + if (is_android) { + sources += [ + "after_startup_task_utils_android.cc", +- "bookmarks/bookmark_html_writer.cc", +- "bookmarks/bookmark_html_writer.h", + "android/accessibility/font_size_prefs_android.cc", + "android/accessibility/font_size_prefs_android.h", + "android/android_theme_resources.h", +diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn +--- a/chrome/utility/BUILD.gn ++++ b/chrome/utility/BUILD.gn +@@ -55,8 +55,6 @@ static_library("utility") { + + if (!is_android) { + sources += [ +- "importer/bookmark_html_reader.cc", +- "importer/bookmark_html_reader.h", + "importer/bookmarks_file_importer.cc", + "importer/bookmarks_file_importer.h", + "importer/edge_database_reader_win.cc", +@@ -160,6 +158,11 @@ static_library("utility") { + ] + } + ++ sources += [ ++ "importer/bookmark_html_reader.cc", ++ "importer/bookmark_html_reader.h", ++ ] ++ + if (use_nss_certs) { + sources += [ + "importer/nss_decryptor_system_nss.cc", +-- +2.7.4 +