From 0e064ac63257e73e6e837c4325a18c2182976e72 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpdavs@gmail.com>
Date: Fri, 29 Aug 2014 10:23:44 +0000
Subject: [PATCH 1/4] [strongSwan] No longer using CACert.

---
 src/chrome/content/rules/{StrongSwan.xml => strongSwan.xml} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/chrome/content/rules/{StrongSwan.xml => strongSwan.xml} (87%)

diff --git a/src/chrome/content/rules/StrongSwan.xml b/src/chrome/content/rules/strongSwan.xml
similarity index 87%
rename from src/chrome/content/rules/StrongSwan.xml
rename to src/chrome/content/rules/strongSwan.xml
index 5a3fbb5ffc02..153a5be48123 100644
--- a/src/chrome/content/rules/StrongSwan.xml
+++ b/src/chrome/content/rules/strongSwan.xml
@@ -1,4 +1,4 @@
-<ruleset name="StrongSwan (partial)" platform="cacert mixedcontent">
+<ruleset name="strongSwan">
 
 	<target host="strongswan.org" />
 	<target host="*.strongswan.org" />

From 9d945d2fac0ab11696b8ce61e8a7a8a28bce4171 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpdavs@gmail.com>
Date: Fri, 29 Aug 2014 10:24:24 +0000
Subject: [PATCH 2/4] [strongSwan] Corrected download subdomain.

---
 src/chrome/content/rules/strongSwan.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/strongSwan.xml b/src/chrome/content/rules/strongSwan.xml
index 153a5be48123..a5807b3f33ca 100644
--- a/src/chrome/content/rules/strongSwan.xml
+++ b/src/chrome/content/rules/strongSwan.xml
@@ -19,7 +19,8 @@
 
 	<!--	Observed subdomains:
 
-			- downloads
+            - download
+            - git
 			- wiki
 			- www
 				-->

From bb7179e65901ce24f447231df8fc322837471b55 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpdavs@gmail.com>
Date: Fri, 29 Aug 2014 10:24:58 +0000
Subject: [PATCH 3/4] [strongSwan] git. cert is valid.

---
 src/chrome/content/rules/strongSwan.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/chrome/content/rules/strongSwan.xml b/src/chrome/content/rules/strongSwan.xml
index a5807b3f33ca..4d90d648029a 100644
--- a/src/chrome/content/rules/strongSwan.xml
+++ b/src/chrome/content/rules/strongSwan.xml
@@ -2,11 +2,6 @@
 
 	<target host="strongswan.org" />
 	<target host="*.strongswan.org" />
-		<!--
-			Cert valid, but shows CRL files:
-							-->
-		<exclusion pattern="^http://git\." />
-
 
 	<!--	Observed cookie domains:
 

From c48134c9c3f0313158094905d87d4610c419b3f0 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpdavs@gmail.com>
Date: Fri, 29 Aug 2014 10:27:59 +0000
Subject: [PATCH 4/4] [strongSwan] Untabify for sanity.

---
 src/chrome/content/rules/strongSwan.xml | 32 +++++++++++--------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/chrome/content/rules/strongSwan.xml b/src/chrome/content/rules/strongSwan.xml
index 4d90d648029a..e5e0a9fb0ac7 100644
--- a/src/chrome/content/rules/strongSwan.xml
+++ b/src/chrome/content/rules/strongSwan.xml
@@ -1,25 +1,21 @@
 <ruleset name="strongSwan">
+    <target host="strongswan.org" />
+    <target host="*.strongswan.org" />
 
-	<target host="strongswan.org" />
-	<target host="*.strongswan.org" />
+    <!--    Observed cookie domains:
+        - ^/
+        - ^wiki
+        - ^www
+        -->
+    <securecookie host="^(?:.*\.)?strongswan\.org$" name=".+" />
 
-	<!--	Observed cookie domains:
-
-			- ^/
-			- ^wiki
-			- ^www
-				-->
-	<securecookie host="^(?:.*\.)?strongswan\.org$" name=".+" />
-
-
-	<!--	Observed subdomains:
 
+    <!--    Observed subdomains:
             - download
             - git
-			- wiki
-			- www
-				-->
-	<rule from="^http://(\w+\.)?strongswan\.org/"
-		to="https://$1strongswan.org/" />
-
+            - wiki
+            - www
+    -->
+    <rule from="^http://(\w+\.)?strongswan\.org/"
+        to="https://$1strongswan.org/" />
 </ruleset>