From 6bb856c34d98276a4a6ee08296d64ed9a03191ae Mon Sep 17 00:00:00 2001
From: MB <kunjurcca@gmail.com>
Date: Sat, 8 Sep 2012 16:27:44 +0100
Subject: [PATCH 1/7] [Symantec] Add exclusion

---
 src/chrome/content/rules/Symantec.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/Symantec.xml b/src/chrome/content/rules/Symantec.xml
index aea7717b2..f1ed4dd83 100644
--- a/src/chrome/content/rules/Symantec.xml
+++ b/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=".*" />

From 8450922ff1b78af4342d5b3a833bff0b2fd8746e Mon Sep 17 00:00:00 2001
From: MB <kunjurcca@gmail.com>
Date: Sat, 8 Sep 2012 20:15:49 +0100
Subject: [PATCH 2/7] [Telegraph] Make mismatches default_off

https://mail1.eff.org/pipermail/https-everywhere-rules/2012-September/001292.html
---
 src/chrome/content/rules/Telegraph-Media-Group-mismatches.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/Telegraph-Media-Group-mismatches.xml b/src/chrome/content/rules/Telegraph-Media-Group-mismatches.xml
index 96b814096..4233536a4 100644
--- a/src/chrome/content/rules/Telegraph-Media-Group-mismatches.xml
+++ b/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)">
+<ruleset name="Telegraph (mismatches)" default_off="mismatch">
 
         <!--	cert: shop.look.co.uk	-->
 	<target host="fashionshop.telegraph.co.uk" />

From 968eb224cd20b96df473eaf6592fbe4afdaa20d4 Mon Sep 17 00:00:00 2001
From: MB <kunjurcca@gmail.com>
Date: Sat, 8 Sep 2012 20:21:51 +0100
Subject: [PATCH 3/7] [cleverbridge] Add exclusion

https://mail1.eff.org/pipermail/https-everywhere-rules/2012-September/001291.html
---
 src/chrome/content/rules/Cleverbridge.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/chrome/content/rules/Cleverbridge.xml b/src/chrome/content/rules/Cleverbridge.xml
index 1b99338e4..6947a056b 100644
--- a/src/chrome/content/rules/Cleverbridge.xml
+++ b/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=".*"/>
 

From 2b93d15cc06d2d4d4b246b2bb0519a3d4245ef0d Mon Sep 17 00:00:00 2001
From: MB <kunjurcca@gmail.com>
Date: Sat, 8 Sep 2012 20:29:51 +0100
Subject: [PATCH 4/7] [News Corporation] Fix

https://mail1.eff.org/pipermail/https-everywhere-rules/2012-September/001291.html
---
 src/chrome/content/rules/News-Corporation.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/News-Corporation.xml b/src/chrome/content/rules/News-Corporation.xml
index 7bc6f40c4..538033f86 100644
--- a/src/chrome/content/rules/News-Corporation.xml
+++ b/src/chrome/content/rules/News-Corporation.xml
@@ -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/"/>

From e127f39da74f30e3b7c8a73c966c93e22c543aa1 Mon Sep 17 00:00:00 2001
From: MB <kunjurcca@gmail.com>
Date: Sat, 8 Sep 2012 20:32:22 +0100
Subject: [PATCH 5/7] [CacheFly] Add exclusion

https://mail1.eff.org/pipermail/https-everywhere-rules/2012-September/001291.html
---
 src/chrome/content/rules/CacheFly.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/CacheFly.xml b/src/chrome/content/rules/CacheFly.xml
index 9191c5977..30e7b4909 100644
--- a/src/chrome/content/rules/CacheFly.xml
+++ b/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>
\ No newline at end of file
+</ruleset>

From 79edbb71f4308eb6db5321d260bca6170e4195b7 Mon Sep 17 00:00:00 2001
From: MB <kunjurcca@gmail.com>
Date: Sat, 8 Sep 2012 22:03:41 +0100
Subject: [PATCH 6/7] [News Corporation] add exclusion

Conflicts:
	src/chrome/content/rules/News-Corporation.xml
---
 src/chrome/content/rules/News-Corporation.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/News-Corporation.xml b/src/chrome/content/rules/News-Corporation.xml
index 538033f86..148fb8e63 100644
--- a/src/chrome/content/rules/News-Corporation.xml
+++ b/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" />

From af3494463653e85377406623bae66d6f087f7c25 Mon Sep 17 00:00:00 2001
From: MB <kunjurcca@gmail.com>
Date: Mon, 10 Sep 2012 04:23:11 +0100
Subject: [PATCH 7/7] [Pidgin] Fix

---
 src/chrome/content/rules/Pidgin.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/chrome/content/rules/Pidgin.xml b/src/chrome/content/rules/Pidgin.xml
index 40b95305b..20f9df550 100644
--- a/src/chrome/content/rules/Pidgin.xml
+++ b/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/"/>