[tor-commits] [tor-browser/esr24] No bug, Automated blocklist update from host bld-linux64-spot-033 - a=blocklist-update

[mikeperry at torproject.org]

commit 32f9a2957316a6f3067dc4b2d05285e88207c4fc
Author: ffxbld <none at none>
Date:   Sat Aug 9 03:12:29 2014 -0700

    No bug, Automated blocklist update from host bld-linux64-spot-033 - a=blocklist-update
---
 browser/app/blocklist.xml |   47 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml
index 5909efe..2e455a6 100644
--- a/browser/app/blocklist.xml
+++ b/browser/app/blocklist.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1406936041000">
+<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1407370380000">
   <emItems>
       <emItem  blockID="i454" id="sqlmoz at facebook.com">
                         <versionRange  minVersion="0" maxVersion="*" severity="3">
@@ -45,6 +45,13 @@
                                                     <prefs>
               </prefs>
     </emItem>
+      <emItem  blockID="i684" id="{9edd0ea8-2819-47c2-8320-b007d5996f8a}">
+                        <versionRange  minVersion="0" maxVersion="*" severity="1">
+                    </versionRange>
+                                                    <prefs>
+                  <pref>browser.search.defaultenginename</pref>
+              </prefs>
+    </emItem>
       <emItem  blockID="i107" os="WINNT" id="{ABDE892B-13A8-4d1b-88E6-365A6E755758}">
                         <versionRange  minVersion="0" maxVersion="15.0.5" severity="1">
                     </versionRange>
@@ -63,7 +70,7 @@
                                                     <prefs>
               </prefs>
     </emItem>
-      <emItem  blockID="i640" id="jid0-l9BxpNUhx1UUgRfKigWzSfrZqAc at jetpack">
+      <emItem  blockID="i688" id="firefox-extension at mozilla.org">
                         <versionRange  minVersion="0" maxVersion="*" severity="3">
                     </versionRange>
                                                     <prefs>
@@ -337,8 +344,8 @@
                                                           <prefs>
               </prefs>
     </emItem>
-      <emItem  blockID="i67" id="youtube2 at youtube2.com">
-                        <versionRange  minVersion="0" maxVersion="*">
+      <emItem  blockID="i640" id="jid0-l9BxpNUhx1UUgRfKigWzSfrZqAc at jetpack">
+                        <versionRange  minVersion="0" maxVersion="*" severity="3">
                     </versionRange>
                                                     <prefs>
               </prefs>
@@ -488,6 +495,12 @@
                                                     <prefs>
               </prefs>
     </emItem>
+      <emItem  blockID="i668" id="/^(matchersite(pro(srcs?)?)?\@matchersite(pro(srcs?)?)?\.com)|((pro)?sitematcher(_srcs?|pro|site|sitesrc|-generic)?\@(pro)?sitematcher(_srcs?|pro|site|sitesrc|-generic)?\.com)$/">
+                        <versionRange  minVersion="0" maxVersion="*" severity="1">
+                    </versionRange>
+                                                    <prefs>
+              </prefs>
+    </emItem>
       <emItem  blockID="i519" id="703db0db-5fe9-44b6-9f53-c6a91a0ad5bd at 7314bc82-969e-4d2a-921b-e5edd0b02cf1.com">
                         <versionRange  minVersion="0" maxVersion="*" severity="1">
                     </versionRange>
@@ -805,12 +818,6 @@
                                                     <prefs>
               </prefs>
     </emItem>
-      <emItem  blockID="i668" id="/^(matchersite(pro(src)?)?\@matchersite(pro(src)?)?\.com)|((pro)?sitematcher(_src|pro|site|sitesrc)?\@(pro)?sitematcher(_src|pro|site|sitesrc)?\.com)$/">
-                        <versionRange  minVersion="0" maxVersion="*" severity="1">
-                    </versionRange>
-                                                    <prefs>
-              </prefs>
-    </emItem>
       <emItem  blockID="i440" id="{2d069a16-fca1-4e81-81ea-5d5086dcbd0c}">
                         <versionRange  minVersion="0" maxVersion="*" severity="1">
                     </versionRange>
@@ -979,6 +986,12 @@
                                                     <prefs>
               </prefs>
     </emItem>
+      <emItem  blockID="i682" id="f6682b47-e12f-400b-9bc0-43b3ccae69d1 at 39d6f481-b198-4349-9ebe-9a93a86f9267.com">
+                        <versionRange  minVersion="0" maxVersion="*" severity="1">
+                    </versionRange>
+                                                    <prefs>
+              </prefs>
+    </emItem>
       <emItem  blockID="i471" id="firefox at luckyleap.net">
                         <versionRange  minVersion="0" maxVersion="*" severity="3">
                     </versionRange>
@@ -1111,6 +1124,12 @@
                                                     <prefs>
               </prefs>
     </emItem>
+      <emItem  blockID="i67" id="youtube2 at youtube2.com">
+                        <versionRange  minVersion="0" maxVersion="*">
+                    </versionRange>
+                                                    <prefs>
+              </prefs>
+    </emItem>
       <emItem  blockID="i560" id="adsremoval at adsremoval.net">
                         <versionRange  minVersion="0" maxVersion="*" severity="1">
                     </versionRange>
@@ -1766,6 +1785,14 @@
                                                     <prefs>
               </prefs>
     </emItem>
+      <emItem  blockID="i686" id="{a7f2cb14-0472-42a1-915a-8adca2280a2c}">
+                        <versionRange  minVersion="0" maxVersion="*" severity="1">
+                    </versionRange>
+                                                    <prefs>
+                  <pref>browser.startup.homepage</pref>
+                  <pref>browser.search.defaultenginename</pref>
+              </prefs>
+    </emItem>
       <emItem  blockID="i580" id="{51c77233-c0ad-4220-8388-47c11c18b355}">
                         <versionRange  minVersion="0" maxVersion="0.1.9999999" severity="1">
                     </versionRange>