From d1ebc00d52a6aad3e5a390a2ebcd25570cdb5872 Mon Sep 17 00:00:00 2001
From: Hugo Gruson <hugo.gruson@protonmail.com>
Date: Mon, 29 Apr 2019 11:29:22 +0200
Subject: [PATCH 1/5] Run hsts-prune

---
 src/chrome/content/rules/22Delta.xml          | 10 ----
 .../rules/Bitly_branded_short_domains.xml     |  1 -
 src/chrome/content/rules/Byte.nl.xml          | 46 ------------------
 src/chrome/content/rules/Bytenoc.nl.xml       | 16 -------
 src/chrome/content/rules/Catbox.moe.xml       | 13 -----
 src/chrome/content/rules/Cihar.com.xml        | 19 --------
 src/chrome/content/rules/GitHub.xml           |  1 -
 src/chrome/content/rules/Intercom.io.xml      | 26 ----------
 src/chrome/content/rules/LUV.asn.au.xml       | 48 -------------------
 src/chrome/content/rules/Libravatar.org.xml   | 30 ------------
 src/chrome/content/rules/Nextiva.xml          | 12 -----
 src/chrome/content/rules/PagerDuty.com.xml    | 46 ------------------
 src/chrome/content/rules/RandomOrg.xml        | 43 -----------------
 src/chrome/content/rules/Rudloff.pro.xml      |  6 ---
 src/chrome/content/rules/Safercar.gov.xml     | 19 --------
 src/chrome/content/rules/StartMail.com.xml    | 17 -------
 src/chrome/content/rules/Telegram.org.xml     | 20 --------
 ...S_Citizenship_and_Immigration_Services.xml | 30 ------------
 .../content/rules/Wildcard_Corp.com.xml       | 28 -----------
 src/chrome/content/rules/administrator.de.xml | 23 ---------
 .../content/rules/aviationweather.gov.xml     | 41 ----------------
 .../content/rules/integrityglobal.com.xml     | 14 ------
 src/chrome/content/rules/jwz.org.xml          | 11 -----
 23 files changed, 520 deletions(-)
 delete mode 100644 src/chrome/content/rules/22Delta.xml
 delete mode 100644 src/chrome/content/rules/Byte.nl.xml
 delete mode 100644 src/chrome/content/rules/Bytenoc.nl.xml
 delete mode 100644 src/chrome/content/rules/Catbox.moe.xml
 delete mode 100644 src/chrome/content/rules/Cihar.com.xml
 delete mode 100644 src/chrome/content/rules/Intercom.io.xml
 delete mode 100644 src/chrome/content/rules/LUV.asn.au.xml
 delete mode 100644 src/chrome/content/rules/Libravatar.org.xml
 delete mode 100644 src/chrome/content/rules/Nextiva.xml
 delete mode 100644 src/chrome/content/rules/PagerDuty.com.xml
 delete mode 100644 src/chrome/content/rules/RandomOrg.xml
 delete mode 100644 src/chrome/content/rules/Rudloff.pro.xml
 delete mode 100644 src/chrome/content/rules/Safercar.gov.xml
 delete mode 100644 src/chrome/content/rules/StartMail.com.xml
 delete mode 100644 src/chrome/content/rules/Telegram.org.xml
 delete mode 100644 src/chrome/content/rules/US_Citizenship_and_Immigration_Services.xml
 delete mode 100644 src/chrome/content/rules/Wildcard_Corp.com.xml
 delete mode 100644 src/chrome/content/rules/administrator.de.xml
 delete mode 100644 src/chrome/content/rules/aviationweather.gov.xml
 delete mode 100644 src/chrome/content/rules/integrityglobal.com.xml
 delete mode 100644 src/chrome/content/rules/jwz.org.xml

diff --git a/src/chrome/content/rules/22Delta.xml b/src/chrome/content/rules/22Delta.xml
deleted file mode 100644
index d39538ccedd6..000000000000
--- a/src/chrome/content/rules/22Delta.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<ruleset name="22Delta">
-	<target host="22delta.com" />
-	<target host="www.22delta.com" />
-	<target host="api.22delta.com" />
-	<target host="pass.22delta.com" />
-
-	<securecookie host=".+" name=".+" />
-
-	<rule from="^http:" to="https:" />
-</ruleset>
diff --git a/src/chrome/content/rules/Bitly_branded_short_domains.xml b/src/chrome/content/rules/Bitly_branded_short_domains.xml
index cae61f7c0a98..27c41ddeb1b2 100644
--- a/src/chrome/content/rules/Bitly_branded_short_domains.xml
+++ b/src/chrome/content/rules/Bitly_branded_short_domains.xml
@@ -15710,7 +15710,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	<target host="julievor.is" />
 	<target host="jump.aesrv.net" />
 	<target host="jump.co.vu" />
-	<target host="jump.mahler.io" />
 	<target host="jump.ovh" />
 	<target host="jumpxl.nl" />
 	<target host="junaplay.ml" />
diff --git a/src/chrome/content/rules/Byte.nl.xml b/src/chrome/content/rules/Byte.nl.xml
deleted file mode 100644
index f0b5811ac28f..000000000000
--- a/src/chrome/content/rules/Byte.nl.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-	Other Byte rulesets:
-
-		- Bytenoc.nl.xml
-
-
-	Nonfunctional hosts in *byte.nl:
-
-		- www.service *
-
-	* 403
-
-
-	These altnames don't exist:
-
-		- www.shoplift.byte.nl
-
-
-	Insecure cookies are set for these hosts:
-
-		- service.byte.nl
-
--->
-<ruleset name="Byte.nl">
-
-	<!--	Direct rewrites:
-				-->
-	<target host="byte.nl" />
-	<target host="shoplift.byte.nl" />
-	<target host="service.byte.nl" />
-	<target host="webmail.byte.nl" />
-	<target host="www.webmail.byte.nl" />
-	<target host="www.byte.nl" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^service\.byte\.nl$" name="^Byte::AuthCookieHandler2_Service$" /-->
-
-	<securecookie host="^service\.byte\.nl$" name=".+" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/Bytenoc.nl.xml b/src/chrome/content/rules/Bytenoc.nl.xml
deleted file mode 100644
index a7ec817a93bc..000000000000
--- a/src/chrome/content/rules/Bytenoc.nl.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
-	For other Byte coverage, see Byte.nl.xml.
-
--->
-<ruleset name="Bytenoc.nl">
-
-	<!--	Direct rewrites:
-				-->
-	<target host="bytenoc.nl" />
-	<target host="www.bytenoc.nl" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/Catbox.moe.xml b/src/chrome/content/rules/Catbox.moe.xml
deleted file mode 100644
index efdc7625aae1..000000000000
--- a/src/chrome/content/rules/Catbox.moe.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<ruleset name="Catbox.moe">
-	<target host="catbox.moe" />
-	<target host="www.catbox.moe" />
-	<target host="blog.catbox.moe" />
-	<target host="files.catbox.moe" />
-	<target host="nofun.catbox.moe" />
-	<target host="qt.catbox.moe" />
-	<target host="status.catbox.moe" />
-
-	<securecookie host=".+" name=".+" />
-
-	<rule from="^http:" to="https:" />
-</ruleset>
diff --git a/src/chrome/content/rules/Cihar.com.xml b/src/chrome/content/rules/Cihar.com.xml
deleted file mode 100644
index 836f89d85c9c..000000000000
--- a/src/chrome/content/rules/Cihar.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-	Nonfunctional subdomains:
-
-		- (www.)	(redirects to http, valid cert)
-		- photos *
-		- pma *
-
-	* 404, valid cert
-
--->
-<ruleset name="Cihar.com (partial)">
-
-	<target host="blog.cihar.com" />
-	<target host="stats.cihar.com" />
-
-
-	<rule from="^http:" to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/GitHub.xml b/src/chrome/content/rules/GitHub.xml
index ae51b1ccf217..6d86f556e053 100644
--- a/src/chrome/content/rules/GitHub.xml
+++ b/src/chrome/content/rules/GitHub.xml
@@ -12,7 +12,6 @@
 <ruleset name="GitHub">
 	<target host="github.io" />
 
-	<target host="collector.githubapp.com" />
 
 	<target host="avatars0.githubusercontent.com" />
 	<target host="avatars1.githubusercontent.com" />
diff --git a/src/chrome/content/rules/Intercom.io.xml b/src/chrome/content/rules/Intercom.io.xml
deleted file mode 100644
index 47a2f9f8f093..000000000000
--- a/src/chrome/content/rules/Intercom.io.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-	Other Intercom rulesets:
-
-		- Intercom_CDN.com.xml
-
-	Preloaded:
-		intercom.io
-
--->
-<ruleset name="Intercom.io">
-
-	<target host="app.intercom.io" />
-	<target host="blog.intercom.io" />
-	<target host="demos.intercom.io" />
-	<target host="developers.intercom.io" />
-	<target host="docs.intercom.io" />
-	<target host="engineering.intercom.io" />
-	<target host="status.intercom.io" />
-	<target host="share.intercom.io" />
-	<target host="via.intercom.io" />
-	<target host="widget.intercom.io" />
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/LUV.asn.au.xml b/src/chrome/content/rules/LUV.asn.au.xml
deleted file mode 100644
index 8dbc0b998cbf..000000000000
--- a/src/chrome/content/rules/LUV.asn.au.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-	Nonfunctional subdomains:
-
-		- lists *
-
-	* 403/404; mismatched, CN: www.luv.asn.au
-
-
-	Problematic subdomains:
-
-		- (www.) ¹
-		- wiki ²
-
-	¹ Works, expired 2013-12-13
-	² Works; mismatched, CN: www.luv.asn.au
-
-
-	Mixed content:
-
-		- Images on ^ from $self *
-
-		- Bugs on ^ from i.creativecommons.org *
-
-	* Secured by us
-
--->
-<ruleset name="LUV.asn.au (partial)" default_off="expired, mismatched">
-
-	<target host="luv.asn.au" />
-	<target host="*.luv.asn.au" />
-
-
-	<!--	Secured by server:
-					-->
-	<!--securecookie host="^\.linux\.org\.au$" name="^luv_wiki_session$" /-->
-	<!--
-		Not secured by server:
-					-->
-	<!--securecookie host="^\.linux\.org\.au$" name="^SESS[0-9a-f]{32}$" /-->
-	<!--securecookie host="^www\.linux\.org\.au$" name="^PHPSESSID" /-->
-
-	<securecookie host="^(?:www)?\.linux\.org\.au$" name=".+" />
-
-
-	<rule from="^http://(?:(wiki\.)|www\.)?luv\.asn\.au/"
-		to="https://$1luv.asn.au/" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/Libravatar.org.xml b/src/chrome/content/rules/Libravatar.org.xml
deleted file mode 100644
index 06035879c8c2..000000000000
--- a/src/chrome/content/rules/Libravatar.org.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-	No working URL known:
-		stats.libravatar.org (401)
-
-	Invalid certificate:
-		cdn.libravatar.org
-		openid.libravatar.org
-
--->
-<ruleset name="Libravatar.org">
-
-	<target host="libravatar.org" />
-	<target host="www.libravatar.org" />
-	<target host="apt.libravatar.org" />
-	<target host="blog.libravatar.org" />
-	<target host="cdn.libravatar.org" />
-	<target host="feeds.libravatar.org" />
-	<target host="seccdn.libravatar.org" />
-	<target host="selfoss.libravatar.org" />
-	<target host="wiki.libravatar.org" />
-
-	<rule from="^http://cdn\.libravatar\.org/"
-		to="https://seccdn.libravatar.org/" />
-
-		<test url="http://cdn.libravatar.org/nobody/195.png" />
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/Nextiva.xml b/src/chrome/content/rules/Nextiva.xml
deleted file mode 100644
index 3c5c93617c2f..000000000000
--- a/src/chrome/content/rules/Nextiva.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<ruleset name="Nextiva">
-
-	<target host="nextiva.com" />
-	<target host="www.nextiva.com" />
-
-
-	<securecookie host="^\.nextiva\.com$" name=".+" />
-
-
-	<rule from="^http:" to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/PagerDuty.com.xml b/src/chrome/content/rules/PagerDuty.com.xml
deleted file mode 100644
index a3d44d9195c9..000000000000
--- a/src/chrome/content/rules/PagerDuty.com.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-	Problematic hosts in *pagerduty.com:
-
-		- developer ¹
-		- status ²
-
-	¹ Tor users blocked by CloudFlare settings
-	² Tor users blocked by StatusPage.io
-
-
-	Fully covered hosts in *pagerduty.com:
-
-		- (www.)?
-		- signup
-		- status
-
-
-	Insecure cookies are set for these domains and hosts:
-
-		- .pagerduty.com
-		- www.pagerduty.com
-
--->
-<ruleset name="PagerDuty.com (partial)">
-
-	<!--	Direct rewrites:
-				-->
-	<target host="pagerduty.com" />
-	<!--target host="developer.pagerduty.com" /-->
-	<target host="signup.pagerduty.com" />
-	<target host="status.pagerduty.com" />
-	<target host="www.pagerduty.com" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^\.pagerduty\.com$" name="^(__cfduid|cf_clearance|uid)$" /-->
-	<!--securecookie host="^www\.pagerduty\.com$" name="^wordpress_(logged_in_|sec_)?[\da-f]{32}" /-->
-
-	<securecookie host="^(?:www)?\.pagerduty\.com$" name=".+" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/RandomOrg.xml b/src/chrome/content/rules/RandomOrg.xml
deleted file mode 100644
index 505a580e594c..000000000000
--- a/src/chrome/content/rules/RandomOrg.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-	Fully covered hosts in *random.org:
-
-		- (www.)?
-		- api
-		- draws
-		- files
-		- games
-		- tuples
-
-
-	These altnames don't exist:
-
-		- codes.random.org
-		- feeds.random.org
-		- raffles.random.org
-		- widgets.random.org
-
--->
-<ruleset name="Random.org">
-
-	<!--	Direct rewrites:
-				-->
-	<target host="random.org" />
-	<target host="api.random.org" />
-	<target host="draws.random.org" />
-	<target host="files.random.org" />
-	<target host="games.random.org" />
-	<target host="tuples.random.org" />
-	<target host="www.random.org" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="\.random\.org$" name="^RDOSESSION$" /-->
-
-	<securecookie host="\.random\.org$" name=".+" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/Rudloff.pro.xml b/src/chrome/content/rules/Rudloff.pro.xml
deleted file mode 100644
index c1cb927fc0e7..000000000000
--- a/src/chrome/content/rules/Rudloff.pro.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ruleset name="Rudloff.pro">
-  <target host="rudloff.pro" />
-  <target host="www.rudloff.pro" />
-
-  <rule from="^http:" to="https:" />
-</ruleset>
diff --git a/src/chrome/content/rules/Safercar.gov.xml b/src/chrome/content/rules/Safercar.gov.xml
deleted file mode 100644
index 4b93a7ff8616..000000000000
--- a/src/chrome/content/rules/Safercar.gov.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-
-
-	^safercar.gov: Handshake fails
-	www.safercar.gov: Redirects to http
-
--->
-<ruleset name="Safercar.gov (partial)">
-
-	<target host="vinrcl.safercar.gov" />
-
-
-	<securecookie host="^\w" name=".+" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/StartMail.com.xml b/src/chrome/content/rules/StartMail.com.xml
deleted file mode 100644
index 62eb7731f6cd..000000000000
--- a/src/chrome/content/rules/StartMail.com.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
-	Invalid certificate:
-		beta.startmail.com
-
--->
-<ruleset name="StartMail.com">
-	<target host="startmail.com" />
-	<target host="www.startmail.com" />
-	<target host="forum.startmail.com" />
-	<target host="live.startmail.com" />
-	<target host="support.startmail.com" />
-
-	<securecookie host="^(www|forum)\.startmail\.com$" name=".+" />
-
-	<rule from="^http:"
-		to="https:" />
-</ruleset>
diff --git a/src/chrome/content/rules/Telegram.org.xml b/src/chrome/content/rules/Telegram.org.xml
deleted file mode 100644
index ccced2fdbad7..000000000000
--- a/src/chrome/content/rules/Telegram.org.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-	Other Telegram rulesets:
-
-		- Tdesktop.com.xml
-		- Telegram.me.xml
-		- t.me.xml
-		- Telegram.wiki.xml
-
--->
-<ruleset name="Telegram.org">
-	<target host="telegram.org" />
-	<target host="www.telegram.org" />
-	<target host="core.telegram.org" />
-	<target host="desktop.telegram.org" />
-	<target host="web.telegram.org" />
-
-	<securecookie host=".+" name=".+" />
-
-	<rule from="^http:"	to="https:" />
-</ruleset>
diff --git a/src/chrome/content/rules/US_Citizenship_and_Immigration_Services.xml b/src/chrome/content/rules/US_Citizenship_and_Immigration_Services.xml
deleted file mode 100644
index 84c74a4c9f62..000000000000
--- a/src/chrome/content/rules/US_Citizenship_and_Immigration_Services.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-	For other U.S. government coverage, see US-government.xml.
-
-
-
-	Nonfunctional subdomains:
-
-		- ^	(times out)
-		- blog	(interrupted)
-		- www	(403, akamai)
-
-
-	Partially covered subdomains:
-
-		- infopass	($ redirects to http, css/infopass2.css 404s)
-
--->
-<ruleset name="U.S. Citizenship and Immigration Services (partial)">
-
-	<target host="*.uscis.gov" />
-		<exclusion pattern="^http://infopass\.uscis\.gov/(?:$|css/infopass2\.css)" />
-
-
-	<rule from="^http://blog\.uscis\.gov/favicon\.ico"
-		to="https://www.blogger.com/favicon.ico" />
-
-	<rule from="^http://(egov|infopass)\.uscis\.gov/"
-		to="https://$1.uscis.gov/" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/Wildcard_Corp.com.xml b/src/chrome/content/rules/Wildcard_Corp.com.xml
deleted file mode 100644
index 54cea5051e7e..000000000000
--- a/src/chrome/content/rules/Wildcard_Corp.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-	Other Wildcard Corp rulesets:
-
-		- Cdig.me.xml
-
-
-	Mixed content:
-
-		- css, on:
-
-			- www.wildcardcorp.com from fonts.googleapis.com *
-
-	* Secured by us
-
--->
-<ruleset name="Wildcard Corp.com">
-
-	<target host="wildcardcorp.com" />
-	<target host="www.wildcardcorp.com" />
-
-
-	<securecookie host="^\.wildcardcorp\.com$" name=".+" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/administrator.de.xml b/src/chrome/content/rules/administrator.de.xml
deleted file mode 100644
index d32aa2412085..000000000000
--- a/src/chrome/content/rules/administrator.de.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-	Insecure cookies are set for these hosts:
-
-		- www.administrator.de
-
--->
-<ruleset name="administrator.de">
-
-	<target host="administrator.de" />
-	<target host="www.administrator.de" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^www\.administrator\.de$" name="^PHPSESSID$" /-->
-
-	<securecookie host="^\w" name=".+" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/aviationweather.gov.xml b/src/chrome/content/rules/aviationweather.gov.xml
deleted file mode 100644
index 39d847c8b699..000000000000
--- a/src/chrome/content/rules/aviationweather.gov.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-
-
-	Problematic hosts in *aviationweather.gov:
-
-		-  svn ᵐ
-
-	ᵐ Mismatched
-
-
-	Insecure cookies are set for these hosts:
-
-		- aviationweather.gov
-		- bcaws.aviationweather.gov
-		- new.aviationweather.gov
-		- testbed.aviationweather.gov
-		- www.aviationweather.gov
-
--->
-<ruleset name="Aviation Weather.gov (partial)">
-
-	<target host="aviationweather.gov" />
-	<target host="bcaws.aviationweather.gov" />
-	<target host="nam.aviationweather.gov" />
-	<target host="new.aviationweather.gov" />
-	<target host="shiftlog.aviationweather.gov" />
-	<target host="testbed.aviationweather.gov" />
-	<target host="www.aviationweather.gov" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^(?:(?:bcaws|new|testbed|www)\.)?aviationweather\.gov$" name="^PHPSESSID$" /-->
-
-	<securecookie host="^\w" name=".+" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/integrityglobal.com.xml b/src/chrome/content/rules/integrityglobal.com.xml
deleted file mode 100644
index 372840cfe7bb..000000000000
--- a/src/chrome/content/rules/integrityglobal.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<ruleset name="Integrity Global.com">
-
-	<target host="integrityglobal.com" />
-	<target host="www.integrityglobal.com" />
-
-
-	<securecookie host="^\." name="^(?:__cfduid|cf_clearance)$" />
-	<securecookie host="^\w" name=".+" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/jwz.org.xml b/src/chrome/content/rules/jwz.org.xml
deleted file mode 100644
index e9617a3ff4b9..000000000000
--- a/src/chrome/content/rules/jwz.org.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<ruleset name="jwz.org">
-
-	<target host="jwz.org" />
-	<target host="www.jwz.org" />
-
-	<securecookie host="(^|\.)www\.jwz\.org$" name=".+" />
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>

From 98e2861c7372148484761d67112a92f51e543290 Mon Sep 17 00:00:00 2001
From: Hugo Gruson <hugo.gruson@protonmail.com>
Date: Mon, 29 Apr 2019 11:37:45 +0200
Subject: [PATCH 2/5] Update references

---
 src/chrome/content/rules/Cdig.me.xml          | 3 ---
 src/chrome/content/rules/Intercom_CDN.com.xml | 3 ---
 src/chrome/content/rules/Tdesktop.com.xml     | 2 +-
 src/chrome/content/rules/Telegram.me.xml      | 5 ++++-
 src/chrome/content/rules/Telegram.wiki.xml    | 2 +-
 src/chrome/content/rules/t.me.xml             | 2 +-
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/chrome/content/rules/Cdig.me.xml b/src/chrome/content/rules/Cdig.me.xml
index 6c4939fc3802..2def8f85d4a3 100644
--- a/src/chrome/content/rules/Cdig.me.xml
+++ b/src/chrome/content/rules/Cdig.me.xml
@@ -1,7 +1,4 @@
 <!--
-	For other Wildcard Corp coverage, see Wildcard_Corp.com.xml.
-
-
 	Mixed content:
 
 		- Image on (www.) from www.google.com *
diff --git a/src/chrome/content/rules/Intercom_CDN.com.xml b/src/chrome/content/rules/Intercom_CDN.com.xml
index a0b0968f11dd..7bc7d8a276b8 100644
--- a/src/chrome/content/rules/Intercom_CDN.com.xml
+++ b/src/chrome/content/rules/Intercom_CDN.com.xml
@@ -1,7 +1,4 @@
 <!--
-	For other Intercom rules, see Intercom.io.xml.
-
-
 	Insecure cookies are set for these domains:
 
 		- .intercomcdn.com
diff --git a/src/chrome/content/rules/Tdesktop.com.xml b/src/chrome/content/rules/Tdesktop.com.xml
index cacd48c3a751..25b10c59108c 100644
--- a/src/chrome/content/rules/Tdesktop.com.xml
+++ b/src/chrome/content/rules/Tdesktop.com.xml
@@ -3,7 +3,7 @@
 Disabled by https-everywhere-checker because:
 Fetch error: http://update.tdesktop.com/ => https://update.tdesktop.com/: (51, "SSL: no alternative certificate subject name matches target host name 'update.tdesktop.com'")
 
-	For other Telegram coverage, see Telegram.org.xml.
+	For other Telegram coverage, see Telegram.me.xml.
 
 
 	These altnames don't exist:
diff --git a/src/chrome/content/rules/Telegram.me.xml b/src/chrome/content/rules/Telegram.me.xml
index 2af9236ae5f0..7f6acf845553 100644
--- a/src/chrome/content/rules/Telegram.me.xml
+++ b/src/chrome/content/rules/Telegram.me.xml
@@ -1,5 +1,8 @@
 <!--
-	For other Telegram coverage, see Telegram.org.xml.
+	Other Telegram rulesets:
+		- Tdesktop.com.xml
+		- t.me.xml
+		- Telegram.wiki.xml
 
 -->
 <ruleset name="Telegram.me">
diff --git a/src/chrome/content/rules/Telegram.wiki.xml b/src/chrome/content/rules/Telegram.wiki.xml
index 7bdc6c8eb64d..f81e4c1a29ca 100644
--- a/src/chrome/content/rules/Telegram.wiki.xml
+++ b/src/chrome/content/rules/Telegram.wiki.xml
@@ -1,5 +1,5 @@
 <!--
-	For other Telegram coverage, see Telegram.org.xml.
+	For other Telegram coverage, see Telegram.me.xml.
 
 	Mismatch:
 		ip
diff --git a/src/chrome/content/rules/t.me.xml b/src/chrome/content/rules/t.me.xml
index 8d843f3cd245..2aca98d8fc5f 100644
--- a/src/chrome/content/rules/t.me.xml
+++ b/src/chrome/content/rules/t.me.xml
@@ -1,5 +1,5 @@
 <!--
-	For other Telegram coverage, see Telegram.org.xml.
+	For other Telegram coverage, see Telegram.me.xml.
 -->
 
 <ruleset name="t.me">

From b9a986349cdcac41dce96bbcd396303b385ec906 Mon Sep 17 00:00:00 2001
From: Hugo Gruson <hugo.gruson@protonmail.com>
Date: Mon, 29 Apr 2019 13:26:55 +0200
Subject: [PATCH 3/5] Whitelist Bitly ruleset

---
 utils/ruleset-whitelist.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv
index ec1b2a8c23c9..8737d37d432b 100644
--- a/utils/ruleset-whitelist.csv
+++ b/utils/ruleset-whitelist.csv
@@ -330,7 +330,7 @@ a0134fe6daf1357222392652186d939db2bff2d536c66f04be36c9cc4d40d016,1,1,Birthday_in
 573cba521c4d30634c5a52f669401e6fa01062c2ac6862f3a084d43b566d34e7,1,1,Bishop_Interactive.xml
 0e7aa1032567406b6d90062e0aea70739d396e8df454174215feffc75583274c,0,1,Bitcoin_Plus.xml
 508f2ce6714df34a9face9de0832e7813b20a88420b2012fef6d682bef057712,1,1,Bitlove.xml
-721fc20c6e0a7885e83ae05e4cd6c03807408ab0c8b7f085cd1d1b3d9c7f6007,0,1,Bitly_branded_short_domains.xml
+30ae916c8fc3f2e59be898d280a193980e17f6d888e92fb39f7755b937c8df8e,0,1,Bitly_branded_short_domains.xml
 89060e710c9b7da93c51d49146db2b363b1026b3688f74575e8f41b91452e515,0,1,BitRock-mismatches.xml
 d8ee4c87b0620b6042c91603f08487127062a0a139d668e8c750d02a08fb2a77,0,1,Bitsontherun.com.xml
 488fd6c9aaf93eddc2eb9d2bda98d612269a42d022db8d847eb51910ab0a1595,0,1,Black_Box.co.uk.xml

From 304393955b20d753471e1db9f9e7646cc0dfdc7f Mon Sep 17 00:00:00 2001
From: Hugo Gruson <hugo.gruson@protonmail.com>
Date: Mon, 13 May 2019 11:33:18 +0200
Subject: [PATCH 4/5] Run hsts-prune again

---
 src/chrome/content/rules/Enalean.com.xml | 28 ------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 src/chrome/content/rules/Enalean.com.xml

diff --git a/src/chrome/content/rules/Enalean.com.xml b/src/chrome/content/rules/Enalean.com.xml
deleted file mode 100644
index 63bdaa4f7666..000000000000
--- a/src/chrome/content/rules/Enalean.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-	These altnames don't exist:
-
-		- www.my.enalean.com
-
-
-	Insecure cookies are set for these domains:
-
-		- my.enalean.com
-
--->
-<ruleset name="Enalean.com">
-
-	<target host="enalean.com" />
-	<target host="my.enalean.com" />
-	<target host="www.enalean.com" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^my\.enalean\.com$" name="^PHPSESSID$" /-->
-
-	<securecookie host="^my\.enalean\.com$" name=".+" />
-
-
-	<rule from="^http:" to="https:" />
-
-</ruleset>

From 6eff0d21e4623417841ae3cd669d899e14c988b1 Mon Sep 17 00:00:00 2001
From: Hugo Gruson <hugo.gruson@protonmail.com>
Date: Tue, 21 May 2019 13:30:53 +0200
Subject: [PATCH 5/5] Remove Despora.de.xml

---
 src/chrome/content/rules/Despora.de.xml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 src/chrome/content/rules/Despora.de.xml

diff --git a/src/chrome/content/rules/Despora.de.xml b/src/chrome/content/rules/Despora.de.xml
deleted file mode 100644
index 3d14d67d7573..000000000000
--- a/src/chrome/content/rules/Despora.de.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<ruleset name="Despora.de">
-
-	<target host="despora.de" />
-	<target host="www.despora.de" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
-