Merge remote-tracking branch 'negres/master'

Conflicts:
	src/chrome/content/rules/Telegraph-Media-Group-mismatches.xml

src/chrome/content/rules/CacheFly.xml

@@ -1,6 +1,13 @@
 <ruleset name="CacheFly">
   <target host="*.cachefly.net" />
+	<!--
+		Breaks speed test.
+
+		https://mail1.eff.org/pipermail/https-everywhere-rules/2012-September/001291.html
+							-->
+	<exclusion pattern="^http://(?:\d\.)?cachefly\.cachefly\.net/(?:speedtest/|.+\.test)" />
+
 
   <rule from="^http://(?:\d\.)?([^@:/\.]+)\.cachefly\.net/"
           to="https://$1.cachefly.net/" />
-</ruleset>
+</ruleset>

src/chrome/content/rules/Cleverbridge.xml

@@ -5,6 +5,12 @@
 	<target host="cleverbridge.org"/>
 	<target host="*.cleverbridge.org"/>
 		<exclusion pattern="^http://(events|saas)\."/>
+		<!--
+			Breaks MajorGeeks mailing list signup.
+
+			https://mail1.eff.org/pipermail/https-everywhere-rules/2012-September/001291.html
+							-->
+		<exclusion pattern="^http://message\.cleverbridge\.com/bin/icon_generator\?key=captcha-key$" />
 
 	<securecookie host="^(.*\.)cleverbridge\.com$" name=".*"/>
 

src/chrome/content/rules/News-Corporation.xml

@@ -31,7 +31,7 @@
 		<exclusion pattern="http://bc\.wsj\.net/"/>
 		<!--	Doesn't translate directly
 			to s2.wsj.net	-->
-		<exclusion pattern="^http://barrons\.wsj\.net/djstyle/" />
+		<exclusion pattern="^http://barrons\.wsj\.net/(css/barronsDependencies|djstyle)/" />
 	<target host="services.wsje.com"/>
 	<target host="s.smartmoney.net" />
 	<target host="sc.smartmoney.net" />
@@ -99,7 +99,7 @@
 		to="https://a248.e.akamai.net/f/1731/67675/12h/mw$1.wsj.net/$25/" />
 
 	<rule from="^https?://sc\.wsj\.net/css/(cssDependencies/hat-icons|standalone_partner_hat|teublog|wsjblog(?:_global(?:_2|_static)?)?)\.css"
-		to="https://a248.e.akamai.net/f/1731/67675/12h/css/$1.css" />
+		to="https://a248.e.akamai.net/f/1731/67675/12h/sc.wsj.net/css/$1.css" />
 
 	<rule from="^http://(www\.)?wsjeuropesubs\.com/"
 		to="https://$1wsjeuropesubs.com/"/>

src/chrome/content/rules/Pidgin.xml

@@ -1,11 +1,13 @@
 <ruleset name="Pidgin (partial)">
 
-  <target host="pidgin.im" />
+  <!--target host="pidgin.im" /-->
   <target host="developer.pidgin.im" />
-  <target host="www.pidgin.im" />
+  <!--target host="www.pidgin.im" /-->
+
+	<!--	They've made this more tricky, so disabled for now.
 
   <rule from="^http://(www\.)?pidgin\.im/shared/"
-          to="https://developer.pidgin.im/shared/" />
+          to="https://developer.pidgin.im/shared/" /-->
 
   <rule from="^http://developer\.pidgin\.im/(chrome|extension|static|viewmtn)/"
 	to="https://developer.pidgin.im/$1/"/>

src/chrome/content/rules/Symantec.xml

@@ -24,7 +24,7 @@
 	<target host="symantec.com" />
 	<target host="*.symantec.com" />
 		<!--	These redirect to http.	-->
-		<exclusion pattern="^http://www\.symantec\.com/connect/($|all-connect$|articles/|blogs/|forums/)" />
+		<exclusion pattern="^http://www\.symantec\.com/connect/($|all-connect$|articles/|blogs/|imagebrowser/view/image/|forums/)" />
 
 
 	<securecookie host="^(.*\.)?symantec\.com$" name=".*" />

src/chrome/content/rules/Telegraph-Media-Group-mismatches.xml

@@ -5,7 +5,7 @@
 	images.lynku.com                (cert: shop.look.co.uk)
 
 -->
-<ruleset name="Telegraph (mismatches)" default_off="cert warnings">
+<ruleset name="Telegraph (mismatches)" default_off="mismatch">
 
         <!--	cert: shop.look.co.uk	-->
 	<target host="fashionshop.telegraph.co.uk" />