[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] [https-everywhere/master] add target host to all remaining pending rules
Author: Seth Schoen <schoen@xxxxxxx>
Date: Wed, 3 Nov 2010 21:34:06 -0700
Subject: add target host to all remaining pending rules
Commit: c97b3f9230dece8cb2125f540d19a3b010bf2155
---
pending-rules/LWN.xml | 3 +++
pending-rules/Lastminute.xml | 6 ++++--
pending-rules/LensRentals.xml | 3 +++
pending-rules/LibraryThing.xml | 3 +++
pending-rules/Linode.xml | 4 ++++
pending-rules/Linux.com.xml | 3 +++
pending-rules/LinuxFR.xml | 3 +++
pending-rules/LinuxFoundation.xml | 2 ++
pending-rules/LiveJournal.xml | 3 +++
pending-rules/Loopt.xml | 3 +++
pending-rules/LoveFilm.xml | 3 +++
pending-rules/Magento.xml | 3 +++
pending-rules/Magnatune.xml | 3 +++
pending-rules/Magnet.ie.xml | 3 +++
pending-rules/MapQuest.xml | 7 +++++++
pending-rules/Match.xml | 3 +++
pending-rules/Miranda-IM.xml | 3 +++
pending-rules/Moneybookers.xml | 3 +++
pending-rules/Mozdev.xml | 3 +++
pending-rules/MyCharity.ie.xml | 3 +++
pending-rules/MyPoints.xml | 3 +++
pending-rules/MyUHC.xml | 3 +++
pending-rules/MyWOT.xml | 3 +++
pending-rules/NL-Politiek.xml | 29 ++++++++++++++++-------------
pending-rules/NTU.xml | 5 +++++
pending-rules/NZBIndex.xml | 3 +++
pending-rules/NameCheap.xml | 4 ++++
pending-rules/NameCom.xml | 3 +++
pending-rules/Names.xml | 5 +++++
pending-rules/Netflix.xml | 3 +++
pending-rules/Nokia.xml | 11 +++++++++++
pending-rules/NottinghamAC.xml | 7 +++++++
pending-rules/OneHub.xml | 3 +++
pending-rules/Open-Mesh.xml | 4 ++++
pending-rules/OpenDNS.xml | 3 +++
pending-rules/OpenID.xml | 3 +++
pending-rules/OpenSSL.xml | 3 +++
pending-rules/OpenStreetMap.xml | 2 ++
pending-rules/Orange.xml | 3 +++
pending-rules/OverClockers.xml | 3 +++
pending-rules/OxfamIrelandUnwrapped.xml | 4 ++++
pending-rules/OzBargain.xml | 3 +++
pending-rules/PCCaseGear.xml | 5 +++++
pending-rules/Pandora.xml | 3 +++
pending-rules/Pastebin.ca.xml | 3 +++
pending-rules/PearsonVUE.xml | 5 +++++
pending-rules/Ping.fm.xml | 3 +++
pending-rules/Pipex.xml | 3 +++
pending-rules/PirateBay.xml | 6 ++++++
pending-rules/PirateParty.xml | 7 +++++++
pending-rules/Pizzahut.xml | 4 ++++
pending-rules/Playboy.xml | 5 ++++-
pending-rules/PlentyOfFish.xml | 3 +++
pending-rules/Plus.xml | 5 +++++
pending-rules/Pogo.xml | 4 ++++
pending-rules/Postbank.xml | 3 +++
pending-rules/Privacybox.de.xml | 3 +++
pending-rules/Proxify.xml | 3 +++
pending-rules/QIP.xml | 3 ++-
pending-rules/Qualys.xml | 6 +++++-
pending-rules/Quora.xml | 3 +++
pending-rules/Quorks.xml | 2 +-
pending-rules/RFC-Editor.xml | 3 +++
pending-rules/ROBOXchange.xml | 3 +++
pending-rules/RadioShack.xml | 3 +++
pending-rules/RapidSSL.xml | 3 +++
pending-rules/RedHat.xml | 3 +++
pending-rules/Reddit.xml | 3 +++
pending-rules/RememberTheMilk.xml | 3 +++
pending-rules/Riseup.xml | 3 +++
pending-rules/RoadRunner.xml | 4 ++++
pending-rules/SafariBooksOnline.xml | 3 +++
pending-rules/Savannah.xml | 3 +++
pending-rules/Schneier-on-Security.xml | 3 +++
pending-rules/Secunia.xml | 3 +++
pending-rules/SecurityNL.xml | 5 ++++-
pending-rules/Sendmail.xml | 3 +++
pending-rules/SinnFein.xml | 3 +++
pending-rules/Sipgate.xml | 4 ++++
pending-rules/SixApart.xml | 6 ++++++
pending-rules/Skandiabanken.xml | 5 +++++
pending-rules/Slo-Tech.xml | 4 ++++
pending-rules/SlySoft.xml | 4 ++++
pending-rules/SouthernElectric.xml | 3 +++
pending-rules/SpamGourmet.xml | 3 +++
pending-rules/Sparkfun.xml | 4 ++++
pending-rules/Spin.de.xml | 3 +++
pending-rules/Spyderco.xml | 3 +++
pending-rules/StartCom.xml | 13 +++++++++++++
pending-rules/StumbleUpon.xml | 3 +++
pending-rules/Swiss.xml | 3 +++
pending-rules/Symbian.xml | 2 ++
pending-rules/T-Mobile.xml | 9 +++++++++
pending-rules/TAZ.xml | 3 +++
pending-rules/Target.xml | 4 ++++
pending-rules/Teamxlink.xml | 3 +++
pending-rules/TechCrunch.xml | 3 +++
pending-rules/TheAA.xml | 3 +++
pending-rules/Three.xml | 4 ++++
pending-rules/Torrentz.xml | 5 +++++
pending-rules/Trashmail.xml | 3 +++
pending-rules/TweetDeck.xml | 3 +++
pending-rules/Twitpic.xml | 5 +++++
pending-rules/Typepad.xml | 3 +++
pending-rules/UNM.xml | 5 +++++
pending-rules/UOregon.xml | 7 +++++++
pending-rules/USPS.xml | 4 ++++
pending-rules/UiO.xml | 6 ++++++
pending-rules/United.xml | 6 ++++++
pending-rules/VZNetzwerke.xml | 4 ++++
pending-rules/VideoLAN.xml | 3 +++
pending-rules/VirusTotal.xml | 3 +++
pending-rules/Vodafone.xml | 7 +++++++
pending-rules/Vonage.xml | 7 +++++++
pending-rules/Vuze.xml | 3 +++
pending-rules/Web.de.xml | 3 +++
pending-rules/WhatCD.xml | 2 ++
pending-rules/WinPcap.xml | 3 +++
pending-rules/Wireshark.xml | 4 ++++
pending-rules/Woot.xml | 3 +++
pending-rules/XOSkins.com.xml | 3 +++
pending-rules/XS4ALL.xml | 3 +++
pending-rules/Xing.xml | 3 +++
pending-rules/YFrog.xml | 3 +++
pending-rules/Your-Freedom.xml | 3 +++
pending-rules/Zimbra.xml | 3 +++
pending-rules/btjunkie.xml | 5 +++++
pending-rules/eHow.xml | 3 +++
pending-rules/hi5.xml | 3 +++
pending-rules/so36.net.xml | 3 +++
pending-rules/uTorrent.xml | 5 +++++
131 files changed, 502 insertions(+), 20 deletions(-)
diff --git a/pending-rules/LWN.xml b/pending-rules/LWN.xml
index 426293c..e186508 100644
--- a/pending-rules/LWN.xml
+++ b/pending-rules/LWN.xml
@@ -1,4 +1,7 @@
<ruleset name="LWN">
+ <target host="lwn.net" />
+ <target host="www.lwn.net" />
+
<rule from="^http://(www\.)?lwn\.net/" to="https://lwn.net/"/>
</ruleset>
diff --git a/pending-rules/Lastminute.xml b/pending-rules/Lastminute.xml
index 8c65cf9..4fb6bf2 100644
--- a/pending-rules/Lastminute.xml
+++ b/pending-rules/Lastminute.xml
@@ -1,4 +1,6 @@
<ruleset name="Lastminute.com">
- <rule from="^http://lastminute\.com/"; to="https://www.lastminute.com/"/>
- <rule from="^http://www\.lastminute\.com/"; to="https://www.lastminute.com/"/>
+ <target host="www.lastminute.com" />
+ <target host="lastminute.com" />
+
+ <rule from="^http://(www\.)?lastminute\.com/" to="https://www.lastminute.com/"/>
</ruleset>
diff --git a/pending-rules/LensRentals.xml b/pending-rules/LensRentals.xml
index 2064314..3e42cf7 100644
--- a/pending-rules/LensRentals.xml
+++ b/pending-rules/LensRentals.xml
@@ -1,3 +1,6 @@
<ruleset name="LensRentals.com">
+ <target host="www.lensrentals.com" />
+ <target host="lensrentals.com" />
+
<rule from="^http://(www\.)?lensrentals\.com/" to="https://www.lensrentals.com/"/>
</ruleset>
diff --git a/pending-rules/LibraryThing.xml b/pending-rules/LibraryThing.xml
index 8492356..46ef69e 100644
--- a/pending-rules/LibraryThing.xml
+++ b/pending-rules/LibraryThing.xml
@@ -1,3 +1,6 @@
<ruleset name="LibraryThing">
+ <target host="www.librarything.com" />
+ <target host="librarything.com" />
+
<rule from="^http://(www\.)?librarything\.com/" to="https://www.librarything.com/"/>
</ruleset>
diff --git a/pending-rules/Linode.xml b/pending-rules/Linode.xml
index def11b5..4e3c231 100644
--- a/pending-rules/Linode.xml
+++ b/pending-rules/Linode.xml
@@ -1,4 +1,8 @@
<ruleset name="Linode">
+ <target host="linode.com" />
+ <target host="www.linode.com" />
+ <target host="stats.linode.com" />
+
<rule from="^http://(www\.)?linode\.com/" to="https://www.linode.com/"/>
<rule from="^http://stats\.linode\.com/"; to="https://stats.linode.com/"/>
</ruleset>
diff --git a/pending-rules/Linux.com.xml b/pending-rules/Linux.com.xml
index c0a75a3..44c08c3 100644
--- a/pending-rules/Linux.com.xml
+++ b/pending-rules/Linux.com.xml
@@ -1,4 +1,7 @@
<ruleset name="Linux.com">
+ <target host="linux.com" />
+ <target host="*.linux.com" />
+
<rule from="^http://linux\.com/"; to="https://www.linux.com/"/>
<rule from="^http://([^/:@]*)\.linux\.com/" to="https://$1.linux.com/"/>
</ruleset>
diff --git a/pending-rules/LinuxFR.xml b/pending-rules/LinuxFR.xml
index e451693..f528760 100644
--- a/pending-rules/LinuxFR.xml
+++ b/pending-rules/LinuxFR.xml
@@ -1,4 +1,7 @@
<ruleset name="DaLinuxFrenchPage">
+ <target host="linuxfr.org" />
+ <target host="www.linuxfr.org" />
+
<rule from="^http://(www\.)?linuxfr\.org/" to="https://linuxfr.org/"/>
</ruleset>
diff --git a/pending-rules/LinuxFoundation.xml b/pending-rules/LinuxFoundation.xml
index f14f092..6cfc0f4 100644
--- a/pending-rules/LinuxFoundation.xml
+++ b/pending-rules/LinuxFoundation.xml
@@ -1,4 +1,6 @@
<ruleset name="LinuxFoundation">
+ <target host="*.linuxfoundation.org" />
+
<rule from="^http://([^/:@]*)\.linuxfoundation\.org/" to="https://$1.linuxfoundation.org/"/>
</ruleset>
diff --git a/pending-rules/LiveJournal.xml b/pending-rules/LiveJournal.xml
index 0fcd9b1..5d390ae 100644
--- a/pending-rules/LiveJournal.xml
+++ b/pending-rules/LiveJournal.xml
@@ -3,5 +3,8 @@ this rule protects login passwords but prevents the user from reading
other users' journals! -->
<ruleset name="LiveJournal" default_off="breaks for non-logged-in users">
+ <target host="livejournal.com" />
+ <target host="www.livejournal.com" />
+
<rule from="^http://(?:www\.)?livejournal\.com/" to="https://www.livejournal.com/"/>
</ruleset>
diff --git a/pending-rules/Loopt.xml b/pending-rules/Loopt.xml
index 925f7b0..4503bab 100644
--- a/pending-rules/Loopt.xml
+++ b/pending-rules/Loopt.xml
@@ -1,3 +1,6 @@
<ruleset name="Loopt">
+ <target host="loopt.com" />
+ <target host="www.loopt.com" />
+
<rule from="^http://(www\.)?loopt\.com/" to="https://www.loopt.com/"/>
</ruleset>
diff --git a/pending-rules/LoveFilm.xml b/pending-rules/LoveFilm.xml
index 4686e17..1b7481e 100644
--- a/pending-rules/LoveFilm.xml
+++ b/pending-rules/LoveFilm.xml
@@ -1,4 +1,7 @@
<ruleset name="LoveFilm">
+ <target host="lovefilm.com" />
+ <target host="*.lovefilm.com" />
+
<rule from="^http://(www\.)?lovefilm\.com/" to="https://www.lovefilm.com/"/>
<rule from="^http://(static|images[0-9]*)\.lovefilm\.com/" to="https://$1.lovefilm.com/"/>
</ruleset>
diff --git a/pending-rules/Magento.xml b/pending-rules/Magento.xml
index 2cfa11c..91c0bb9 100644
--- a/pending-rules/Magento.xml
+++ b/pending-rules/Magento.xml
@@ -1,4 +1,7 @@
<ruleset name="Magento">
+ <target host="magentocommerce.com" />
+ <target host="www.magentocommerce.com" />
+
<rule from="^http://(www\.)?magentocommerce\.com/" to="https://www.magentocommerce.com/"/>
</ruleset>
diff --git a/pending-rules/Magnatune.xml b/pending-rules/Magnatune.xml
index 8934c34..6235192 100644
--- a/pending-rules/Magnatune.xml
+++ b/pending-rules/Magnatune.xml
@@ -1,3 +1,6 @@
<ruleset name="Magnatune">
+ <target host="magnatune.com" />
+ <target host="www.magnatune.com" />
+
<rule from="^http://(www\.)?magnatune\.com/" to="https://magnatune.com/"/>
</ruleset>
diff --git a/pending-rules/Magnet.ie.xml b/pending-rules/Magnet.ie.xml
index 3bb4ace..7892182 100644
--- a/pending-rules/Magnet.ie.xml
+++ b/pending-rules/Magnet.ie.xml
@@ -1,4 +1,7 @@
<ruleset name="Magnet.ie">
<!-- cert valid only for www. -->
+ <target host="magnet.ie" />
+ <target host="www.magnet.ie" />
+
<rule from="^http://(www\.)?magnet\.ie/" to="https://www.magnet.ie/"/>
</ruleset>
diff --git a/pending-rules/MapQuest.xml b/pending-rules/MapQuest.xml
index 8781a86..014449e 100644
--- a/pending-rules/MapQuest.xml
+++ b/pending-rules/MapQuest.xml
@@ -1,4 +1,11 @@
<ruleset name="MapQuest">
+ <target host="mapquest.com" />
+ <target host="www.mapquest.com" />
+ <target host="mapquestapi.com" />
+ <target host="www.mapquestapi.com" />
+ <target host="mapquesthelp.com" />
+ <target host="www.mapquesthelp.com" />
+
<rule from="^http://(www\.)?mapquest\.com/" to="https://www.mapquest.com/"/>
<rule from="^http://developer\.mapquest\.com/"; to="https://developer.mapquest.com/"/>
<rule from="^http://(www\.)?mapquestapi\.com/" to="https://www.mapquestapi.com/"/>
diff --git a/pending-rules/Match.xml b/pending-rules/Match.xml
index 95080d7..4adc6b5 100644
--- a/pending-rules/Match.xml
+++ b/pending-rules/Match.xml
@@ -1,3 +1,6 @@
<ruleset name="Match">
+ <target host="match.com" />
+ <target host="www.match.com" />
+
<rule from="^http://(www\.)?match\.com/" to="https://www.match.com/"/>
</ruleset>
diff --git a/pending-rules/Miranda-IM.xml b/pending-rules/Miranda-IM.xml
index 43dfa99..dfa0539 100644
--- a/pending-rules/Miranda-IM.xml
+++ b/pending-rules/Miranda-IM.xml
@@ -1,4 +1,7 @@
<ruleset name="Miranda-IM">
+ <target host="miranda-im.org" />
+ <target host="*.miranda-im.org" />
+
<rule from="^http://([^/:@]*)\.miranda-im\.org/" to="https://$1.miranda-im.org/"/>
</ruleset>
diff --git a/pending-rules/Moneybookers.xml b/pending-rules/Moneybookers.xml
index 3f6be6c..bf801b8 100644
--- a/pending-rules/Moneybookers.xml
+++ b/pending-rules/Moneybookers.xml
@@ -1,3 +1,6 @@
<ruleset name="Moneybookers">
+ <target host="moneybookers.com" />
+ <target host="www.moneybookers.com" />
+
<rule from="^http://(www\.)?moneybookers\.com/" to="https://www.moneybookers.com/"/>
</ruleset>
diff --git a/pending-rules/Mozdev.xml b/pending-rules/Mozdev.xml
index 320529a..1de9534 100644
--- a/pending-rules/Mozdev.xml
+++ b/pending-rules/Mozdev.xml
@@ -1,3 +1,6 @@
<ruleset name="Mozdev">
+ <target host="mozdev.org" />
+ <target host="*.mozdev.org" />
+
<rule from="^http://([^@:/]+\.)?mozdev\.org/" to="https://$1mozdev.org/"/>
</ruleset>
diff --git a/pending-rules/MyCharity.ie.xml b/pending-rules/MyCharity.ie.xml
index 043ac14..f5b103d 100644
--- a/pending-rules/MyCharity.ie.xml
+++ b/pending-rules/MyCharity.ie.xml
@@ -1,4 +1,7 @@
<ruleset name="MyCharity.ie">
<!-- cert valid only for www. -->
+ <target host="mycharity.ie" />
+ <target host="www.mycharity.ie" />
+
<rule from="^http://(www\.)?mycharity\.ie/" to="https://www.mycharity.ie/"/>
</ruleset>
diff --git a/pending-rules/MyPoints.xml b/pending-rules/MyPoints.xml
index ea1aa62..4152bf9 100644
--- a/pending-rules/MyPoints.xml
+++ b/pending-rules/MyPoints.xml
@@ -1,3 +1,6 @@
<ruleset name="MyPoints">
+ <target host="mypoints.com" />
+ <target host="www.mypoints.com" />
+
<rule from="^http://(www\.)?mypoints\.com/" to="https://www.mypoints.com/"/>
</ruleset>
diff --git a/pending-rules/MyUHC.xml b/pending-rules/MyUHC.xml
index 855df2d..f476dc0 100644
--- a/pending-rules/MyUHC.xml
+++ b/pending-rules/MyUHC.xml
@@ -1,4 +1,7 @@
<ruleset name="MyUHC">
+ <target host="myuhc.com" />
+ <target host="www.myuhc.com" />
+
<rule from="^http://(www\.)?myuhc\.com/" to="https://www.myuhc.com/"/>
</ruleset>
diff --git a/pending-rules/MyWOT.xml b/pending-rules/MyWOT.xml
index 8a28f79..b2dce0a 100644
--- a/pending-rules/MyWOT.xml
+++ b/pending-rules/MyWOT.xml
@@ -1,3 +1,6 @@
<ruleset name="MyWOT">
+ <target host="mywot.com" />
+ <target host="www.mywot.com" />
+
<rule from="^http://(www\.)?mywot\.com/" to="https://www.mywot.com/"/>
</ruleset>
diff --git a/pending-rules/NL-Politiek.xml b/pending-rules/NL-Politiek.xml
index 4c88c15..6656268 100644
--- a/pending-rules/NL-Politiek.xml
+++ b/pending-rules/NL-Politiek.xml
@@ -1,14 +1,17 @@
<ruleset name="NL Politiek">
-<rule
-from="^http://(?:www\.)?(cda|d66)\.nl/"
-to="https://www.$1.nl/"; />
-<rule
-from="^http://(?:www\.)?(groenlinks)\.nl/"
-to="https://$1.nl/"; />
-<rule
-from="^http://sp\.nl/";
-to="https://www.sp.nl/"; />
-<rule
-from="^http://(\w+\.sp)\.nl/"
-to="https://$1.nl/"; />
-</ruleset>
\ No newline at end of file
+ <target host="cda.nl" />
+ <target host="www.cda.nl" />
+ <target host="d66.nl" />
+ <target host="www.d66.nl" />
+ <target host="groenlinks.nl" />
+ <target host="www.groenlinks.nl" />
+ <target host="sp.nl" />
+ <target host="www.sp.nl" />
+ <target host="sp.nl" />
+ <target host="*.sp.nl" />
+
+<rule from="^http://(?:www\.)?(cda|d66)\.nl/" to="https://www.$1.nl/"; />
+<rule from="^http://(?:www\.)?(groenlinks)\.nl/" to="https://$1.nl/"; />
+<rule from="^http://sp\.nl/"; to="https://www.sp.nl/"; />
+<rule from="^http://(\w+\.sp)\.nl/" to="https://$1.nl/"; />
+</ruleset>
diff --git a/pending-rules/NTU.xml b/pending-rules/NTU.xml
index c490f79..7ee8f67 100644
--- a/pending-rules/NTU.xml
+++ b/pending-rules/NTU.xml
@@ -1,4 +1,9 @@
<ruleset name="NTU">
+ <target host="ntu.ac.uk" />
+ <target host="www.ntu.ac.uk" />
+ <target host="ntualumni.org.uk" />
+ <target host="www.ntualumni.org.uk" />
+
<rule from="^http://(www\.)?ntu\.ac\.uk/" to="https://www.ntu.ac.uk/"/>
<rule from="^http://(www\.)?ntualumni\.org\.uk/" to="https://www.ntualumni.org.uk/"/>
</ruleset>
diff --git a/pending-rules/NZBIndex.xml b/pending-rules/NZBIndex.xml
index 9eba610..9b1ddab 100644
--- a/pending-rules/NZBIndex.xml
+++ b/pending-rules/NZBIndex.xml
@@ -1,4 +1,7 @@
<ruleset name="NZBIndex.nl">
+ <target host="nzbindex.nl" />
+ <target host="www.nzbindex.nl" />
+
<rule from="^http://(www\.)?nzbindex\.nl/" to="https://nzbindex.nl/"/>
</ruleset>
diff --git a/pending-rules/NameCheap.xml b/pending-rules/NameCheap.xml
index f3a0724..1eb1e05 100644
--- a/pending-rules/NameCheap.xml
+++ b/pending-rules/NameCheap.xml
@@ -1,4 +1,8 @@
<ruleset name="NameCheap">
+ <target host="namecheap.com" />
+ <target host="www.namecheap.com" />
+ <target host="files.namecheap.com" />
+
<rule from="^http://(www\.)?namecheap\.com/" to="https://www.namecheap.com/"/>
<rule from="^http://files\.namecheap\.com/"; to="https://files.namecheap.com/"/>
</ruleset>
diff --git a/pending-rules/NameCom.xml b/pending-rules/NameCom.xml
index 62ac32f..e160e9d 100644
--- a/pending-rules/NameCom.xml
+++ b/pending-rules/NameCom.xml
@@ -1,3 +1,6 @@
<ruleset name="NameCom">
+ <target host="name.com" />
+ <target host="www.name.com" />
+
<rule from="^http://(www\.)?name\.com/" to="https://www.name.com/"/>
</ruleset>
diff --git a/pending-rules/Names.xml b/pending-rules/Names.xml
index dfa2d80..e664577 100644
--- a/pending-rules/Names.xml
+++ b/pending-rules/Names.xml
@@ -1,4 +1,9 @@
<ruleset name="Names">
+ <target host="names.co.uk" />
+ <target host="www.names.co.uk" />
+ <target host="admin.names.co.uk" />
+ <target host="webmail4.names.co.uk" />
+
<rule from="^http://(www\.)?names\.co\.uk/" to="https://www.names.co.uk/"/>
<rule from="^http://(admin|webmail4?)\.names\.co\.uk/" to="https://$1.names.co.uk/"/>
</ruleset>
diff --git a/pending-rules/Netflix.xml b/pending-rules/Netflix.xml
index f263305..83d0a07 100644
--- a/pending-rules/Netflix.xml
+++ b/pending-rules/Netflix.xml
@@ -1,3 +1,6 @@
<ruleset name="Netflix">
+ <target host="netflix.com" />
+ <target host="www.netflix.com" />
+
<rule from="^http://(www\.)?netflix\.com/" to="https://www.netflix.com/"/>
</ruleset>
diff --git a/pending-rules/Nokia.xml b/pending-rules/Nokia.xml
index f29a307..c287d77 100644
--- a/pending-rules/Nokia.xml
+++ b/pending-rules/Nokia.xml
@@ -1,4 +1,15 @@
<ruleset name="Nokia">
+ <target host="nokia.com" />
+ <target host="www.nokia.com" />
+ <target host="nokia.co.uk" />
+ <target host="www.nokia.co.uk" />
+ <target host="nokia.ca" />
+ <target host="www.nokia.ca" />
+ <target host="nokia.fr" />
+ <target host="www.nokia.fr" />
+ <target host="nokia.de" />
+ <target host="www.nokia.de" />
+
<rule from="^http://(www\.)?nokia\.com/" to="https://www.nokia.com/"/>
<rule from="^http://(www\.)?nokia\.co\.uk/" to="https://www.nokia.co.uk/"/>
<rule from="^http://(www\.)?nokia\.ca/" to="https://www.nokia.ca/"/>
diff --git a/pending-rules/NottinghamAC.xml b/pending-rules/NottinghamAC.xml
index 07ea09a..0b0924c 100644
--- a/pending-rules/NottinghamAC.xml
+++ b/pending-rules/NottinghamAC.xml
@@ -1,3 +1,10 @@
<ruleset name="NottinghamAC">
+ <target host="nottingham.ac.uk" />
+ <target host="www.nottingham.ac.uk" />
+ <target host="jobs.nottingham.ac.uk" />
+ <target host="email.nottingham.ac.uk" />
+ <target host="owa.nottingham.ac.uk" />
+ <target host="jobs.nottingham.ac.uk" />
+
<rule from="^http://((www|jobs|email|owa|jobs)\.)?nottingham\.ac\.uk/" to="https://$1nottingham.ac.uk/"/>
</ruleset>
diff --git a/pending-rules/OneHub.xml b/pending-rules/OneHub.xml
index f9a40f4..f98cb9f 100644
--- a/pending-rules/OneHub.xml
+++ b/pending-rules/OneHub.xml
@@ -1,3 +1,6 @@
<ruleset name="Onehub.com">
+ <target host="onehub.com" />
+ <target host="www.onehub.com" />
+
<rule from="^http://(www\.)?onehub\.com/" to="https://onehub.com/"/>
</ruleset>
diff --git a/pending-rules/Open-Mesh.xml b/pending-rules/Open-Mesh.xml
index 8096602..d13fbb1 100644
--- a/pending-rules/Open-Mesh.xml
+++ b/pending-rules/Open-Mesh.xml
@@ -1,4 +1,8 @@
<ruleset name="Open-Mesh">
+ <target host="open-mesh.com" />
+ <target host="www.open-mesh.com" />
+ <target host="dashboard.open-mesh.com" />
+
<rule from="^http://(www\.)?open-mesh\.com/" to="https://www.open-mesh.com/"/>
<rule from="^http://dashboard\.open-mesh\.com/"; to="https://dashboard.open-mesh.com/"/>
</ruleset>
diff --git a/pending-rules/OpenDNS.xml b/pending-rules/OpenDNS.xml
index 1db1163..74f10c9 100644
--- a/pending-rules/OpenDNS.xml
+++ b/pending-rules/OpenDNS.xml
@@ -1,4 +1,7 @@
<ruleset name="OpenDNS">
+ <target host="opendns.com" />
+ <target host="*.opendns.com" />
+
<rule from="^http://(www\.)?opendns\.com/" to="https://www.opendns.com/"/>
<rule from="^http://([^/:@]*)\.opendns\.com/" to="https://$1.opendns.com/"/>
</ruleset>
diff --git a/pending-rules/OpenID.xml b/pending-rules/OpenID.xml
index 79dc864..2038850 100644
--- a/pending-rules/OpenID.xml
+++ b/pending-rules/OpenID.xml
@@ -1,3 +1,6 @@
<ruleset name="OpenID">
+ <target host="openid.net" />
+ <target host="www.openid.net" />
+
<rule from="^http://(www\.)?openid\.net/" to="https://openid.net/"/>
</ruleset>
diff --git a/pending-rules/OpenSSL.xml b/pending-rules/OpenSSL.xml
index fd00495..e2cafa5 100644
--- a/pending-rules/OpenSSL.xml
+++ b/pending-rules/OpenSSL.xml
@@ -1,4 +1,7 @@
<ruleset name="OpenSSL">
+ <target host="openssl.org" />
+ <target host="www.openssl.org" />
+
<rule from="^http://(www\.)?openssl\.org/" to="https://www.openssl.org/"/>
</ruleset>
diff --git a/pending-rules/OpenStreetMap.xml b/pending-rules/OpenStreetMap.xml
index 2b5f866..fc1fba4 100644
--- a/pending-rules/OpenStreetMap.xml
+++ b/pending-rules/OpenStreetMap.xml
@@ -1,3 +1,5 @@
<ruleset name="OpenStreetMap Wiki">
+ <target host="wiki.openstreetmap.org" />
+
<rule from="^http://wiki\.openstreetmap\.org/"; to="https://wiki.openstreetmap.org/"/>
</ruleset>
diff --git a/pending-rules/Orange.xml b/pending-rules/Orange.xml
index b5f7593..0bcaaee 100644
--- a/pending-rules/Orange.xml
+++ b/pending-rules/Orange.xml
@@ -2,5 +2,8 @@
falling back to http -->
<ruleset name="OrangeUK">
+ <target host="orange.co.uk" />
+ <target host="www.orange.co.uk" />
+
<rule from="^http://(www\.)?orange\.co\.uk/" to="https://www.orange.co.uk/"/>
</ruleset>
diff --git a/pending-rules/OverClockers.xml b/pending-rules/OverClockers.xml
index 6c4824f..d9a0ae9 100644
--- a/pending-rules/OverClockers.xml
+++ b/pending-rules/OverClockers.xml
@@ -1,3 +1,6 @@
<ruleset name="OverClockers">
+ <target host="overclockers.co.uk" />
+ <target host="www.overclockers.co.uk" />
+
<rule from="^http://(www\.)?overclockers\.co\.uk/" to="https://www.overclockers.co.uk/"/>
</ruleset>
diff --git a/pending-rules/OxfamIrelandUnwrapped.xml b/pending-rules/OxfamIrelandUnwrapped.xml
index 49dad0e..767eb5b 100644
--- a/pending-rules/OxfamIrelandUnwrapped.xml
+++ b/pending-rules/OxfamIrelandUnwrapped.xml
@@ -1,4 +1,8 @@
<ruleset name="Oxfam Unwrapped">
+ <target host="oxfamirelandunwrapped.com" />
+ <target host="www.oxfamirelandunwrapped.com" />
+ <target host="netbel.oxfamireland.org" />
+
<!-- Republic Of Ireland -->
<rule from="^http://(www\.)?oxfamirelandunwrapped\.com/" to="https://www.oxfamirelandunwrapped.com/"/>
<!-- Northern Ireland -->
diff --git a/pending-rules/OzBargain.xml b/pending-rules/OzBargain.xml
index 151c96b..b857929 100644
--- a/pending-rules/OzBargain.xml
+++ b/pending-rules/OzBargain.xml
@@ -1,3 +1,6 @@
<ruleset name="OzBargain">
+ <target host="ozbargain.com.au" />
+ <target host="www.ozbargain.com.au" />
+
<rule from="^(http|https)://(www\.)?ozbargain\.com\.au/" to="https://www.ozbargain.com.au/"/>
</ruleset>
diff --git a/pending-rules/PCCaseGear.xml b/pending-rules/PCCaseGear.xml
index 93bede1..b57b7f5 100644
--- a/pending-rules/PCCaseGear.xml
+++ b/pending-rules/PCCaseGear.xml
@@ -1,3 +1,8 @@
<ruleset name="PCCaseGear">
+ <target host="pccasegear.com" />
+ <target host="www.pccasegear.com" />
+ <target host="pccasegear.com.au" />
+ <target host="www.pccasegear.com.au" />
+
<rule from="^(http|https)://(www\.)?pccasegear\.(com|com\.au)/" to="https://www.pccasegear.com/"/>
</ruleset>
diff --git a/pending-rules/Pandora.xml b/pending-rules/Pandora.xml
index 5d536fc..adac4e0 100644
--- a/pending-rules/Pandora.xml
+++ b/pending-rules/Pandora.xml
@@ -1,3 +1,6 @@
<ruleset name="Pandora">
+ <target host="pandora.com" />
+ <target host="www.pandora.com" />
+
<rule from="^http://(www\.)?pandora\.com/" to="https://www.pandora.com/"/>
</ruleset>
diff --git a/pending-rules/Pastebin.ca.xml b/pending-rules/Pastebin.ca.xml
index ed71cd2..93fa482 100644
--- a/pending-rules/Pastebin.ca.xml
+++ b/pending-rules/Pastebin.ca.xml
@@ -1,4 +1,7 @@
<ruleset name="Pastebin.ca">
+ <target host="pastebin.ca" />
+ <target host="www.pastebin.ca" />
+
<rule from="^http://(www\.)?pastebin\.ca/" to="https://pastebin.ca/"/>
</ruleset>
diff --git a/pending-rules/PearsonVUE.xml b/pending-rules/PearsonVUE.xml
index c9ce610..6e0cd7f 100644
--- a/pending-rules/PearsonVUE.xml
+++ b/pending-rules/PearsonVUE.xml
@@ -1,6 +1,11 @@
<!-- Should this really always go to www8? Some other numbers work too. -->
<ruleset name="PearsonVue">
+ <target host="vue.com" />
+ <target host="www.vue.com" />
+ <target host="pearsonvue.com" />
+ <target host="www.pearsonvue.com" />
+
<rule from="^http://(www\.)?vue\.com/" to="https://www8.pearsonvue.com/"/>
<rule from="^http://(www\.)?pearsonvue\.com/" to="https://www8.pearsonvue.com/"/>
</ruleset>
diff --git a/pending-rules/Ping.fm.xml b/pending-rules/Ping.fm.xml
index dd3bc7f..e1fe0bf 100644
--- a/pending-rules/Ping.fm.xml
+++ b/pending-rules/Ping.fm.xml
@@ -1,4 +1,7 @@
<ruleset name="Ping.fm">
+ <target host="ping.fm" />
+ <target host="www.ping.fm" />
+
<rule from="^http://(www\.)?ping\.fm/" to="https://ping.fm/"/>
</ruleset>
diff --git a/pending-rules/Pipex.xml b/pending-rules/Pipex.xml
index 91bc1e6..b592676 100644
--- a/pending-rules/Pipex.xml
+++ b/pending-rules/Pipex.xml
@@ -1,3 +1,6 @@
<ruleset name="Pipex">
+ <target host="pipex.co.uk" />
+ <target host="www.pipex.co.uk" />
+
<rule from="^http://(www\.)?pipex\.co\.uk/" to="https://www.pipex.co.uk/"/>
</ruleset>
diff --git a/pending-rules/PirateBay.xml b/pending-rules/PirateBay.xml
index 3c693a0..d1f72ff 100644
--- a/pending-rules/PirateBay.xml
+++ b/pending-rules/PirateBay.xml
@@ -1,4 +1,10 @@
<ruleset name="ThePirateBay">
+ <target host="thepiratebay.org" />
+ <target host="www.thepiratebay.org" />
+ <target host="rss.thepiratebay.org" />
+ <target host="static.thepiratebay.org" />
+ <target host="torrents.thepiratebay.org" />
+
<rule from="^http://(rss|static|torrents)\.thepiratebay\.org/" to="https://$1.thepiratebay.org/"/>
<rule from="^(http|https)://(www\.)?thepiratebay\.org/" to="https://thepiratebay.org/"/>
</ruleset>
diff --git a/pending-rules/PirateParty.xml b/pending-rules/PirateParty.xml
index 3434754..03bb4db 100644
--- a/pending-rules/PirateParty.xml
+++ b/pending-rules/PirateParty.xml
@@ -1,3 +1,10 @@
<ruleset name="PirateParty">
+ <target host="pirateparty.ca" />
+ <target host="www.pirateparty.ca" />
+ <target host="pirateparty.org.au" />
+ <target host="www.pirateparty.org.au" />
+ <target host="pirateparty.uk" />
+ <target host="www.pirateparty.uk" />
+
<rule from="^http://(www\.)?pirateparty\.(ca|org\.(au|uk))/" to="https://www.pirateparty.$2/"/>
</ruleset>
diff --git a/pending-rules/Pizzahut.xml b/pending-rules/Pizzahut.xml
index 8a9988b..08f1c97 100644
--- a/pending-rules/Pizzahut.xml
+++ b/pending-rules/Pizzahut.xml
@@ -1,4 +1,8 @@
<ruleset name="Pizzahut">
+ <target host="pizzahut.co.uk" />
+ <target host="www.pizzahut.co.uk" />
+ <target host="delivery.pizzahut.co.uk" />
+
<rule from="^http://(www\.)?pizzahut\.co\.uk/" to="https://www.pizzahut.co.uk/"/>
<rule from="^http://(delivery)\.pizzahut\.co\.uk/" to="https://$1.pizzahut.co.uk/"/>
</ruleset>
diff --git a/pending-rules/Playboy.xml b/pending-rules/Playboy.xml
index 5617d2e..b8cdc60 100644
--- a/pending-rules/Playboy.xml
+++ b/pending-rules/Playboy.xml
@@ -1,3 +1,6 @@
<ruleset name="Playboy">
+ <target host="playboy.com" />
+ <target host="www.playboy.com" />
+
<rule from="^http://(www\.)?playboy\.com/" to="https://www.playboy.com/"/>
-</ruleset>
\ No newline at end of file
+</ruleset>
diff --git a/pending-rules/PlentyOfFish.xml b/pending-rules/PlentyOfFish.xml
index be06ee7..10dadc1 100644
--- a/pending-rules/PlentyOfFish.xml
+++ b/pending-rules/PlentyOfFish.xml
@@ -1,3 +1,6 @@
<ruleset name="PlentyOfFish">
+ <target host="plentyoffish.com" />
+ <target host="www.plentyoffish.com" />
+
<rule from="^https?://(www\.)?plentyoffish\.com/" to="https://www.plentyoffish.com/"/>
</ruleset>
diff --git a/pending-rules/Plus.xml b/pending-rules/Plus.xml
index 9430972..fa6a8ea 100644
--- a/pending-rules/Plus.xml
+++ b/pending-rules/Plus.xml
@@ -1,4 +1,9 @@
<ruleset name="Plus.net">
+ <target host="plus.net" />
+ <target host="www.plus.net" />
+ <target host="portal.plus.net" />
+ <target host="webmail.plus.net" />
+
<rule from="^http://(www\.)?plus\.net/" to="https://www.plus.net/"/>
<rule from="^http://(portal|webmail)\.plus\.net/" to="https://$1.plus.net/"/>
</ruleset>
diff --git a/pending-rules/Pogo.xml b/pending-rules/Pogo.xml
index 6947057..0ecfee4 100644
--- a/pending-rules/Pogo.xml
+++ b/pending-rules/Pogo.xml
@@ -1,4 +1,8 @@
<ruleset name="Pogo">
+ <target host="pogo.com" />
+ <target host="www.pogo.com" />
+ <target host="help.pogo.com" />
+
<rule from="^http://(www\.)?pogo\.com/" to="https://www.pogo.com/"/>
<rule from="^http://help\.pogo\.com/"; to="https://help.pogo.com/"/>
</ruleset>
diff --git a/pending-rules/Postbank.xml b/pending-rules/Postbank.xml
index 1540924..493378e 100644
--- a/pending-rules/Postbank.xml
+++ b/pending-rules/Postbank.xml
@@ -1,4 +1,7 @@
<ruleset name="Postbank" match_rule="postbank\.">
+ <target host="postbank.de" />
+ <target host="www.postbank.de" />
+
<rule from="^http://(www\.)?postbank\.de/" to="https://www.postbank.de/"/>
</ruleset>
diff --git a/pending-rules/Privacybox.de.xml b/pending-rules/Privacybox.de.xml
index 208c8d0..0b4c480 100644
--- a/pending-rules/Privacybox.de.xml
+++ b/pending-rules/Privacybox.de.xml
@@ -1,3 +1,6 @@
<ruleset name="PrivacyBox">
+ <target host="privacybox.de" />
+ <target host="www.privacybox.de" />
+
<rule from="^http://(www\.)?privacybox\.de/" to="https://privacybox.de/"/>
</ruleset>
diff --git a/pending-rules/Proxify.xml b/pending-rules/Proxify.xml
index 689a48b..8766029 100644
--- a/pending-rules/Proxify.xml
+++ b/pending-rules/Proxify.xml
@@ -1,3 +1,6 @@
<ruleset name="Proxify">
+ <target host="proxify.com" />
+ <target host="www.proxify.com" />
+
<rule from="^https?://(www\.)?proxify\.com/" to="https://proxify.com/"/>
</ruleset>
diff --git a/pending-rules/QIP.xml b/pending-rules/QIP.xml
index 4918549..ffac5bd 100644
--- a/pending-rules/QIP.xml
+++ b/pending-rules/QIP.xml
@@ -1,5 +1,6 @@
<ruleset name="QIP">
+ <target host="qip.ru" />
+ <target host="www.qip.ru" />
<rule from="^http://(www\.)?qip\.ru/" to="https://qip.ru/"/>
-
</ruleset>
diff --git a/pending-rules/Qualys.xml b/pending-rules/Qualys.xml
index b14ee8d..603bed3 100644
--- a/pending-rules/Qualys.xml
+++ b/pending-rules/Qualys.xml
@@ -1,4 +1,8 @@
-<ruleset name="qualys">
+<ruleset name="Qualys">
+ <target host="qualys.com" />
+ <target host="www.qualys.com" />
+ <target host="community.qualys.com" />
+
<rule from="^http://(www\.)?qualys\.com/" to="https://www.qualys.com/"/>
<rule from="^http://community\.qualys\.com/"; to="https://community.qualys.com/"/>
</ruleset>
diff --git a/pending-rules/Quora.xml b/pending-rules/Quora.xml
index 3c1bba1..af1e8d6 100644
--- a/pending-rules/Quora.xml
+++ b/pending-rules/Quora.xml
@@ -1,3 +1,6 @@
<ruleset name="Quora">
+ <target host="quora.com" />
+ <target host="www.quora.com" />
+
<rule from="^http://(www\.)?quora\.com/" to="https://www.quora.com/"/>
</ruleset>
diff --git a/pending-rules/Quorks.xml b/pending-rules/Quorks.xml
index 61e26ab..dbdd70b 100644
--- a/pending-rules/Quorks.xml
+++ b/pending-rules/Quorks.xml
@@ -1,6 +1,6 @@
<ruleset name="Quorks">
+ <target host="quorks.ath.cx" />
<rule from="^http://quorks\.ath\.cx/login\.php$";
to="https://quorks.ath.cx/login.php"/>
-
</ruleset>
diff --git a/pending-rules/RFC-Editor.xml b/pending-rules/RFC-Editor.xml
index 616a482..261fd7e 100644
--- a/pending-rules/RFC-Editor.xml
+++ b/pending-rules/RFC-Editor.xml
@@ -1,3 +1,6 @@
<ruleset name="RFC-Editor">
+ <target host="rfc-editor.org" />
+ <target host="www.rfc-editor.org" />
+
<rule from="^http://(www\.)?rfc-editor\.org/" to="https://www.rfc-editor.org/"/>
</ruleset>
diff --git a/pending-rules/ROBOXchange.xml b/pending-rules/ROBOXchange.xml
index 4acf9d0..86fd2de 100644
--- a/pending-rules/ROBOXchange.xml
+++ b/pending-rules/ROBOXchange.xml
@@ -1,3 +1,6 @@
<ruleset name="ROBOXchange">
+ <target host="roboxchange.com" />
+ <target host="www.roboxchange.com" />
+
<rule from="^http://(www\.)?roboxchange\.com/" to="https://roboxchange.com/"/>
</ruleset>
diff --git a/pending-rules/RadioShack.xml b/pending-rules/RadioShack.xml
index aa15f26..7abf8b0 100644
--- a/pending-rules/RadioShack.xml
+++ b/pending-rules/RadioShack.xml
@@ -1,3 +1,6 @@
<ruleset name="RadioShack">
+ <target host="radioshack.com" />
+ <target host="www.radioshack.com" />
+
<rule from="^http://(www\.)?radioshack\.com/" to="https://www.radioshack.com/"/>
</ruleset>
diff --git a/pending-rules/RapidSSL.xml b/pending-rules/RapidSSL.xml
index 6dcb979..8c74311 100644
--- a/pending-rules/RapidSSL.xml
+++ b/pending-rules/RapidSSL.xml
@@ -1,3 +1,6 @@
<ruleset name="RapidSSL">
+ <target host="rapidssl.com" />
+ <target host="www.rapidssl.com" />
+
<rule from="^http://(www\.)?rapidssl\.com/" to="https://www.rapidssl.com/"/>
</ruleset>
diff --git a/pending-rules/RedHat.xml b/pending-rules/RedHat.xml
index 887c67f..8da0a96 100644
--- a/pending-rules/RedHat.xml
+++ b/pending-rules/RedHat.xml
@@ -1,3 +1,6 @@
<ruleset name="RedHat">
+ <target host="redhat.com" />
+ <target host="www.redhat.com" />
+
<rule from="^http://(www\.)?redhat\.com/" to="https://www.redhat.com/"/>
</ruleset>
diff --git a/pending-rules/Reddit.xml b/pending-rules/Reddit.xml
index 08737db..0d9f6f7 100644
--- a/pending-rules/Reddit.xml
+++ b/pending-rules/Reddit.xml
@@ -3,6 +3,9 @@
be submitted to an unencrypted destination. -->
<ruleset name="Reddit">
+ <target host="reddit.com" />
+ <target host="www.reddit.com" />
+
<rule from="^http://(www\.)?reddit\.com/" to="https://www.reddit.com/"/>
</ruleset>
diff --git a/pending-rules/RememberTheMilk.xml b/pending-rules/RememberTheMilk.xml
index 7f671b7..804ae64 100644
--- a/pending-rules/RememberTheMilk.xml
+++ b/pending-rules/RememberTheMilk.xml
@@ -1,4 +1,7 @@
<ruleset name="RememberTheMilk">
+ <target host="rememberthemilk.com" />
+ <target host="www.rememberthemilk.com" />
+
<rule from="^http://(www\.)?rememberthemilk\.com/" to="https://www.rememberthemilk.com/"/>
</ruleset>
diff --git a/pending-rules/Riseup.xml b/pending-rules/Riseup.xml
index c41cc84..58ee320 100644
--- a/pending-rules/Riseup.xml
+++ b/pending-rules/Riseup.xml
@@ -1,4 +1,7 @@
<ruleset name="Riseup">
+ <target host="riseup.net" />
+ <target host="*.riseup.net" />
+
<rule from="^http://riseup\.net/"; to="https://riseup.net/"/>
<rule from="^http://([^/:@]*)\.riseup\.net/" to="https://$1.riseup.net/"/>
</ruleset>
diff --git a/pending-rules/RoadRunner.xml b/pending-rules/RoadRunner.xml
index 9a35664..ec8274a 100644
--- a/pending-rules/RoadRunner.xml
+++ b/pending-rules/RoadRunner.xml
@@ -1,4 +1,8 @@
<ruleset name="RoadRunner">
+ <target host="rr.com" />
+ <target host="www.rr.com" />
+ <target host="hercules.rr.com" />
+
<rule from="^http://(www\.)?rr\.com/" to="https://www.rr.com/"/>
<rule from="^http://hercules\.rr\.com/"; to="https://hercules.rr.com/"/>
</ruleset>
diff --git a/pending-rules/SafariBooksOnline.xml b/pending-rules/SafariBooksOnline.xml
index 98264f0..e77ffc3 100644
--- a/pending-rules/SafariBooksOnline.xml
+++ b/pending-rules/SafariBooksOnline.xml
@@ -1,4 +1,7 @@
<ruleset name="Safari Books Online">
+ <target host="my.safaribooksonline.com" />
+ <target host="www.safaribooksonline.com" />
+
<rule from="^http://my\.safaribooksonline\.com/login$";
to="https://ssl.safaribooksonline.com/securelogin"/>
<rule from="^http://www\.safaribooksonline\.com/Corporate/Index/logIn\.php$";
diff --git a/pending-rules/Savannah.xml b/pending-rules/Savannah.xml
index f8c7d7c..c77567b 100644
--- a/pending-rules/Savannah.xml
+++ b/pending-rules/Savannah.xml
@@ -1,3 +1,6 @@
<ruleset name="Savannah">
+ <target host="savannah.nongnu.org" />
+ <target host="savannah.gnu.org" />
+
<rule from="^http://savannah\.(non)?gnu\.org/" to="https://savannah.$1gnu.org/"/>
</ruleset>
diff --git a/pending-rules/Schneier-on-Security.xml b/pending-rules/Schneier-on-Security.xml
index 59c9ad7..8c45db9 100644
--- a/pending-rules/Schneier-on-Security.xml
+++ b/pending-rules/Schneier-on-Security.xml
@@ -1,3 +1,6 @@
<ruleset name="Schneier on Security">
+ <target host="schneier.com" />
+ <target host="www.schneier.com" />
+
<rule from="^http://(www\.)?schneier\.com/" to="https://www.schneier.com/"/>
</ruleset>
diff --git a/pending-rules/Secunia.xml b/pending-rules/Secunia.xml
index d1d3238..5dc2935 100644
--- a/pending-rules/Secunia.xml
+++ b/pending-rules/Secunia.xml
@@ -1,4 +1,7 @@
<ruleset name="Secunia">
+ <target host="secunia.com" />
+ <target host="www.secunia.com" />
+
<rule from="^http://(www\.)?secunia\.com/" to="https://secunia.com/"/>
</ruleset>
diff --git a/pending-rules/SecurityNL.xml b/pending-rules/SecurityNL.xml
index 730c8ca..42dcdd3 100644
--- a/pending-rules/SecurityNL.xml
+++ b/pending-rules/SecurityNL.xml
@@ -1,3 +1,6 @@
<ruleset name="Security.NL">
+ <target host="security.nl" />
+ <target host="www.security.nl" />
+
<rule from="^http://(?:www\.)?security\.nl/" to="https://secure.security.nl/"/>
-</ruleset>
\ No newline at end of file
+</ruleset>
diff --git a/pending-rules/Sendmail.xml b/pending-rules/Sendmail.xml
index 90f46d8..cc7746e 100644
--- a/pending-rules/Sendmail.xml
+++ b/pending-rules/Sendmail.xml
@@ -1,3 +1,6 @@
<ruleset name="Sendmail">
+ <target host="sendmail.com" />
+ <target host="www.sendmail.com" />
+
<rule from="^http://(www\.)?sendmail\.com/" to="https://www.sendmail.com/"/>
</ruleset>
diff --git a/pending-rules/SinnFein.xml b/pending-rules/SinnFein.xml
index 87b44ed..c5653b5 100644
--- a/pending-rules/SinnFein.xml
+++ b/pending-rules/SinnFein.xml
@@ -1,3 +1,6 @@
<ruleset name="Sinn Fein">
+ <target host="sinnfein.ie" />
+ <target host="www.sinnfein.ie" />
+
<rule from="^http://(www\.)?sinnfein\.ie/" to="https://www.sinnfein.ie/"/>
</ruleset>
diff --git a/pending-rules/Sipgate.xml b/pending-rules/Sipgate.xml
index d297613..b87bd5c 100644
--- a/pending-rules/Sipgate.xml
+++ b/pending-rules/Sipgate.xml
@@ -1,3 +1,7 @@
<ruleset name="Sipgate">
+ <target host="sipgate.co.uk" />
+ <target host="www.sipgate.co.uk" />
+ <target host="secure.sipgate.co.uk" />
+
<rule from="^http://((www|secure)\.)?sipgate\.co\.uk/" to="https://secure.sipgate.co.uk/"/>
</ruleset>
diff --git a/pending-rules/SixApart.xml b/pending-rules/SixApart.xml
index 37d0338..63121f9 100644
--- a/pending-rules/SixApart.xml
+++ b/pending-rules/SixApart.xml
@@ -1,4 +1,10 @@
<ruleset name="SixApart">
+ <target host="sixapart.com" />
+ <target host="help.sixapart.com" />
+ <target host="www.sixapart.com" />
+ <target host="sixapart.jp" />
+ <target host="www.sixapart.jp" />
+
<rule from="^http://sixapart\.com/"; to="https://sixapart.com/"/>
<rule from="^http://(help|www)\.sixapart\.com/" to="https://$1.sixapart.com/"/>
<rule from="^http://(www\.)?sixapart\.jp/" to="https://www.sixapart.jp/"/>
diff --git a/pending-rules/Skandiabanken.xml b/pending-rules/Skandiabanken.xml
index 20f73c5..3df050b 100644
--- a/pending-rules/Skandiabanken.xml
+++ b/pending-rules/Skandiabanken.xml
@@ -1,4 +1,9 @@
<ruleset name="Skandiabanken">
+ <target host="skandiabanken.no" />
+ <target host="www.skandiabanken.no" />
+ <target host="secure.skandiabanken.no" />
+ <target host="trader.skandiabanken.no" />
+
<rule from="^http://(www\.)?skandiabanken\.no/" to="https://www.skandiabanken.no/"/>
<rule from="^http://secure\.skandiabanken\.no/"; to="https://secure.skandiabanken.no/"/>
<rule from="^http://trader\.skandiabanken\.no/"; to="https://trader.skandiabanken.no/"/>
diff --git a/pending-rules/Slo-Tech.xml b/pending-rules/Slo-Tech.xml
index 51c6df2..be03f65 100644
--- a/pending-rules/Slo-Tech.xml
+++ b/pending-rules/Slo-Tech.xml
@@ -1,4 +1,8 @@
<ruleset name="Slo-Tech">
+ <target host="slo-tech.com" />
+ <target host="www.slo-tech.com" />
+ <target host="static.slo-tech.com" />
+
<rule from="^http://(www\.)?slo-tech\.com/"
to="https://slo-tech.com/"/>
<rule from="^http://static\.slo-tech\.com/";
diff --git a/pending-rules/SlySoft.xml b/pending-rules/SlySoft.xml
index d8951ec..f043578 100644
--- a/pending-rules/SlySoft.xml
+++ b/pending-rules/SlySoft.xml
@@ -1,4 +1,8 @@
<ruleset name="SlySoft">
+ <target host="slysoft.com" />
+ <target host="forum.slysoft.com" />
+ <target host="www.slysoft.com" />
+
<rule from="^http://forum\.slysoft\.com/"; to="https://forum.slysoft.com/"/>
<rule from="^https?://(www\.)?slysoft\.com/" to="https://www.slysoft.com/"/>
</ruleset>
diff --git a/pending-rules/SouthernElectric.xml b/pending-rules/SouthernElectric.xml
index 5badb84..1283ac4 100644
--- a/pending-rules/SouthernElectric.xml
+++ b/pending-rules/SouthernElectric.xml
@@ -1,3 +1,6 @@
<ruleset name="SouthernElectric">
+ <target host="southern-electric.co.uk" />
+ <target host="www.southern-electric.co.uk" />
+
<rule from="^http://(www\.)?southern-electric\.co\.uk/" to="https://www.southern-electric.co.uk/"/>
</ruleset>
diff --git a/pending-rules/SpamGourmet.xml b/pending-rules/SpamGourmet.xml
index 16dc5f4..dd038ab 100644
--- a/pending-rules/SpamGourmet.xml
+++ b/pending-rules/SpamGourmet.xml
@@ -1,4 +1,7 @@
<ruleset name="SpamGourmet">
+ <target host="spamgourmet.com" />
+ <target host="www.spamgourmet.com" />
+
<rule from="^http://spamgourmet\.com/"; to="https://spamgourmet.com/"/>
<rule from="^http://www\.spamgourmet\.com/"; to="https://www.spamgourmet.com/"/>
</ruleset>
diff --git a/pending-rules/Sparkfun.xml b/pending-rules/Sparkfun.xml
index 9dc88f9..1d679df 100644
--- a/pending-rules/Sparkfun.xml
+++ b/pending-rules/Sparkfun.xml
@@ -1,4 +1,8 @@
<ruleset name="Sparkfun">
+ <target host="sparkfun.com" />
+ <target host="www.sparkfun.com" />
+ <target host="static.sparkfun.com" />
+
<rule from="^http://(www\.)?sparkfun\.com/" to="https://www.sparkfun.com/"/>
<rule from="^http://static\.sparkfun\.com/"; to="https://static.sparkfun.com/"/>
</ruleset>
diff --git a/pending-rules/Spin.de.xml b/pending-rules/Spin.de.xml
index 8eb88b2..33deb13 100644
--- a/pending-rules/Spin.de.xml
+++ b/pending-rules/Spin.de.xml
@@ -1,3 +1,6 @@
<ruleset name="Spin.de">
+ <target host="spin.de" />
+ <target host="www.spin.de" />
+
<rule from="^http://(www\.)?spin\.de/" to="https://www.spin.de/"/>
</ruleset>
diff --git a/pending-rules/Spyderco.xml b/pending-rules/Spyderco.xml
index cec88b1..8825460 100644
--- a/pending-rules/Spyderco.xml
+++ b/pending-rules/Spyderco.xml
@@ -1,3 +1,6 @@
<ruleset name="Spyderco">
+ <target host="spyderco.com" />
+ <target host="www.spyderco.com" />
+
<rule from="^http://(www\.)?spyderco\.com/" to="https://$1spyderco.com/"/>
</ruleset>
diff --git a/pending-rules/StartCom.xml b/pending-rules/StartCom.xml
index 1775c2c..6f94082 100644
--- a/pending-rules/StartCom.xml
+++ b/pending-rules/StartCom.xml
@@ -1,4 +1,17 @@
<ruleset name="StartCom">
+ <target host="startssl.com" />
+ <target host="*.startssl.com" />
+ <target host="startssl.net" />
+ <target host="*.startssl.net" />
+ <target host="startssl.org" />
+ <target host="*.startssl.org" />
+ <target host="startssl.eu" />
+ <target host="*.startssl.eu" />
+ <target host="startssl.us" />
+ <target host="*.startssl.us" />
+ <target host="startcom.org" />
+ <target host="*.startcom.org" />
+
<rule from="^http://(.*\.)?startssl\.(com|net|org|eu|us)/" to="https://$1startssl.$2/"/>
<rule from="^http://(.*\.)?startcom\.org/" to="https://$1startcom.org/"/>
</ruleset>
diff --git a/pending-rules/StumbleUpon.xml b/pending-rules/StumbleUpon.xml
index 2b01699..d2232ed 100644
--- a/pending-rules/StumbleUpon.xml
+++ b/pending-rules/StumbleUpon.xml
@@ -1,3 +1,6 @@
<ruleset name="StumbleUpon">
+ <target host="stumbleupon.com" />
+ <target host="www.stumbleupon.com" />
+
<rule from="^http://(www\.)?stumbleupon\.com/" to="https://www.stumbleupon.com/"/>
</ruleset>
diff --git a/pending-rules/Swiss.xml b/pending-rules/Swiss.xml
index e575fc0..e2a9669 100644
--- a/pending-rules/Swiss.xml
+++ b/pending-rules/Swiss.xml
@@ -1,4 +1,7 @@
<ruleset name="Swiss.com">
+ <target host="swiss.com" />
+ <target host="www.swiss.com" />
+
<rule from="^http://(www\.)?swiss\.com/" to="https://www.swiss.com/"/>
</ruleset>
diff --git a/pending-rules/Symbian.xml b/pending-rules/Symbian.xml
index f1bf87f..0b45c88 100644
--- a/pending-rules/Symbian.xml
+++ b/pending-rules/Symbian.xml
@@ -1,4 +1,6 @@
<ruleset name="Symbian Foundation">
+ <target host="developer.symbian.org" />
+
<rule from="^http://developer\.symbian\.org/"; to="https://developer.symbian.org/"; />
</ruleset>
diff --git a/pending-rules/T-Mobile.xml b/pending-rules/T-Mobile.xml
index d68b959..fb0a3bc 100644
--- a/pending-rules/T-Mobile.xml
+++ b/pending-rules/T-Mobile.xml
@@ -3,6 +3,15 @@
certificate errors. -->
<ruleset name="Tmobile">
+ <target host="t-mobile.com" />
+ <target host="www.t-mobile.com" />
+ <target host="my.t-mobile.com" />
+ <target host="tmobile.com" />
+ <target host="www.tmobile.com" />
+ <target host="my.tmobile.com" />
+ <target host="t-mobile.co.uk" />
+ <target host="www.t-mobile.co.uk" />
+
<rule from="^http://(www\.)?t-mobile\.com/" to="https://www.t-mobile.com/"/>
<rule from="^http://(www\.)?tmobile\.com/" to="https://www.tmobile.com/"/>
<rule from="^http://my\.t-?mobile\.com/"; to="https://my.t-mobile.com/"/>
diff --git a/pending-rules/TAZ.xml b/pending-rules/TAZ.xml
index 98be5a0..cd013a8 100644
--- a/pending-rules/TAZ.xml
+++ b/pending-rules/TAZ.xml
@@ -1,3 +1,6 @@
<ruleset name="TAZ">
+ <target host="taz.de" />
+ <target host="www.taz.de" />
+
<rule from="^http://(www\.)?taz\.de/" to="https://www.taz.de/"/>
</ruleset>
diff --git a/pending-rules/Target.xml b/pending-rules/Target.xml
index 90a1683..1e35d9d 100644
--- a/pending-rules/Target.xml
+++ b/pending-rules/Target.xml
@@ -1,4 +1,8 @@
<ruleset name="Target">
+ <target host="target.com" />
+ <target host="www.target.com" />
+ <target host="sites.target.com" />
+
<rule from="^http://(www\.)?target\.com/" to="https://www.target.com/"/>
<rule from="^http://sites\.target\.com/"; to="https://sites.target.com/"/>
</ruleset>
diff --git a/pending-rules/Teamxlink.xml b/pending-rules/Teamxlink.xml
index f0a2bd6..8225a54 100644
--- a/pending-rules/Teamxlink.xml
+++ b/pending-rules/Teamxlink.xml
@@ -1,3 +1,6 @@
<ruleset name="Teamxlink">
+ <target host="teamxlink.co.uk" />
+ <target host="www.teamxlink.co.uk" />
+
<rule from="^http://(www\.)?teamxlink\.co\.uk/" to="https://www.teamxlink.co.uk/"/>
</ruleset>
diff --git a/pending-rules/TechCrunch.xml b/pending-rules/TechCrunch.xml
index 6983b8d..dd3625a 100644
--- a/pending-rules/TechCrunch.xml
+++ b/pending-rules/TechCrunch.xml
@@ -1,3 +1,6 @@
<ruleset name="Techcrunch">
+ <target host="techcrunch.com" />
+ <target host="www.techcrunch.com" />
+
<rule from="^http://(www\.)?techcrunch\.com/" to="https://techcrunch.com/"/>
</ruleset>
diff --git a/pending-rules/TheAA.xml b/pending-rules/TheAA.xml
index 9adcef5..5021ee4 100644
--- a/pending-rules/TheAA.xml
+++ b/pending-rules/TheAA.xml
@@ -1,3 +1,6 @@
<ruleset name="TheAA">
+ <target host="theaa.com" />
+ <target host="www.theaa.com" />
+
<rule from="^http://(www\.)?theaa\.com/" to="https://www.theaa.com/"/>
</ruleset>
diff --git a/pending-rules/Three.xml b/pending-rules/Three.xml
index 599012c..050260f 100644
--- a/pending-rules/Three.xml
+++ b/pending-rules/Three.xml
@@ -1,4 +1,8 @@
<ruleset name="Three">
+ <target host="three.ie" />
+ <target host="www.three.ie" />
+ <target host="threestore.three.co.uk" />
+
<rule from="^http://(www\.)?three\.ie/" to="https://www.three.ie/"/>
<rule from="^http://threestore\.three\.co\.uk/"; to=" https://threestore.three.co.uk/"/>
</ruleset>
diff --git a/pending-rules/Torrentz.xml b/pending-rules/Torrentz.xml
index fdec3c8..9bac510 100644
--- a/pending-rules/Torrentz.xml
+++ b/pending-rules/Torrentz.xml
@@ -1,3 +1,8 @@
<ruleset name="Torrentz">
+ <target host="torrentz.com" />
+ <target host="www.torrentz.com" />
+ <target host="torrentz.eu" />
+ <target host="www.torrentz.eu" />
+
<rule from="^https?://(www\.)?torrentz\.(com|eu)/" to="https://www.torrentz.$2/"/>
</ruleset>
diff --git a/pending-rules/Trashmail.xml b/pending-rules/Trashmail.xml
index 81c33c9..94c84c3 100644
--- a/pending-rules/Trashmail.xml
+++ b/pending-rules/Trashmail.xml
@@ -1,3 +1,6 @@
<ruleset name="Trashmail">
+ <target host="trashmail.net" />
+ <target host="www.trashmail.net" />
+
<rule from="^http://(www\.)?trashmail\.net/" to="https://ssl.trashmail.net/"/>
</ruleset>
diff --git a/pending-rules/TweetDeck.xml b/pending-rules/TweetDeck.xml
index 3e158d2..9c04012 100644
--- a/pending-rules/TweetDeck.xml
+++ b/pending-rules/TweetDeck.xml
@@ -1,4 +1,7 @@
<ruleset name="Tweetdeck">
+ <target host="tweetdeck.com" />
+ <target host="www.tweetdeck.com" />
+
<exclusion pattern="^http://support\.tweetdeck\.com/"/><!-- cert for wrong domain -->
<rule from="^http://(www\.)?tweetdeck\.com/" to="https://www.tweetdeck.com/"/>
</ruleset>
diff --git a/pending-rules/Twitpic.xml b/pending-rules/Twitpic.xml
index 2f15e4e..3d7f968 100644
--- a/pending-rules/Twitpic.xml
+++ b/pending-rules/Twitpic.xml
@@ -1,3 +1,8 @@
+<!-- Need another rule to actually protect the images, though. -->
+
<ruleset name="TwitPic">
+ <target host="twitpic.com" />
+ <target host="www.twitpic.com" />
+
<rule from="^http://(www\.)?twitpic\.com/" to="https://twitpic.com/"/>
</ruleset>
diff --git a/pending-rules/Typepad.xml b/pending-rules/Typepad.xml
index 4d23bee..630fa35 100644
--- a/pending-rules/Typepad.xml
+++ b/pending-rules/Typepad.xml
@@ -1,3 +1,6 @@
<ruleset name="Typepad">
+ <target host="typepad.com" />
+ <target host="www.typepad.com" />
+
<rule from="^http://(www\.)?typepad\.com/" to="https://www.typepad.com/"/>
</ruleset>
diff --git a/pending-rules/UNM.xml b/pending-rules/UNM.xml
index 50f3be6..d76a6f2 100644
--- a/pending-rules/UNM.xml
+++ b/pending-rules/UNM.xml
@@ -1,4 +1,9 @@
<ruleset name="UNM">
+ <target host="unm.edu" />
+ <target host="www.unm.edu" />
+ <target host="ece.unm.edu" />
+ <target host="www.ece.unm.edu" />
+
<rule from="^http://(www\.)?unm\.edu/" to="https://www.unm.edu/"/>
<rule from="^http://(www\.)?ece\.unm\.edu/" to="https://www.ece.unm.edu/"/>
</ruleset>
diff --git a/pending-rules/UOregon.xml b/pending-rules/UOregon.xml
index a889bb3..60ab650 100644
--- a/pending-rules/UOregon.xml
+++ b/pending-rules/UOregon.xml
@@ -1,4 +1,11 @@
<ruleset name="UOregon (Partial!)">
+ <target host="*.uoregon.edu" />
+ <target host="systems.cs.uoregon.edu" />
+ <target host="www2.lcb.uoregon.edu" />
+ <target host="www.cs.uoregon.edu" />
+ <target host="www.law.uoregon.edu" />
+ <target host="www.lcb.uoregon.edu" />
+
<rule from="^http://(oregoncis|blackboard|duckweb|hr2|ir|pcs|budgetmotel|brp|libweb|lcb|odt|scholarsbank|wiki|systems\.cs|www2\.lcb|www\.(cs|law|lcb))\.uoregon\.edu/"
to="https://$1.uoregon.edu/"/>
<rule from="^http://(ba|safetyweb)\.uoregon\.edu/sites/"
diff --git a/pending-rules/USPS.xml b/pending-rules/USPS.xml
index bcbe901..1697eaf 100644
--- a/pending-rules/USPS.xml
+++ b/pending-rules/USPS.xml
@@ -1,4 +1,8 @@
<ruleset name="USPS">
+ <target host="usps.com" />
+ <target host="www.usps.com" />
+ <target host="shop.usps.com" />
+
<rule from="^http://(www\.)?usps\.com/" to="https://www.usps.com/"/>
<rule from="^http://shop\.usps\.com/"; to="https://shop.usps.com/"/>
</ruleset>
diff --git a/pending-rules/UiO.xml b/pending-rules/UiO.xml
index 2776e12..367b472 100644
--- a/pending-rules/UiO.xml
+++ b/pending-rules/UiO.xml
@@ -1,4 +1,10 @@
<ruleset name="UiO">
+ <target host="uio.no" />
+ <target host="www.uio.no" />
+ <target host="studweb.uio.no" />
+ <target host="apollon.uio.no" />
+ <target host="www.apollon.uio.no" />
+
<rule from="^http://uio\.no/"; to="https://uio.no/"/>
<rule from="^http://www\.uio\.no/"; to="https://www.uio.no/"/>
diff --git a/pending-rules/United.xml b/pending-rules/United.xml
index d8430cc..c0f9e90 100644
--- a/pending-rules/United.xml
+++ b/pending-rules/United.xml
@@ -1,4 +1,10 @@
<ruleset name="United Airlines">
+ <target host="united.com" />
+ <target host="www.united.com" />
+ <target host="travel.united.com" />
+ <target host="ua2go.com" />
+ <target host="www.ua2go.com" />
+
<rule from="^http://(www\.)?united\.com/" to="https://www.united.com/"/>
<rule from="^http://travel\.united\.com/"; to="https://travel.united.com/"/>
<rule from="^http://(www\.)?ua2go\.com/" to="https://www.ua2go.com/"/>
diff --git a/pending-rules/VZNetzwerke.xml b/pending-rules/VZNetzwerke.xml
index 8ee7b5f..c2d9b33 100644
--- a/pending-rules/VZNetzwerke.xml
+++ b/pending-rules/VZNetzwerke.xml
@@ -1,4 +1,8 @@
<ruleset name="VZnetzwerke">
+ <target host="www.schuelervz.net" />
+ <target host="www.studivz.net" />
+ <target host="www.meinvz.net" />
+
<rule from="^http://www\.schuelervz\.net/"; to="https://www.schuelervz.net/"/>
<rule from="^http://www\.studivz\.net/"; to="https://www.studivz.net/"/>
<rule from="^http://www\.meinvz\.net/"; to="https://www.meinvz.net/"/>
diff --git a/pending-rules/VideoLAN.xml b/pending-rules/VideoLAN.xml
index 2a5babd..c63f3a5 100644
--- a/pending-rules/VideoLAN.xml
+++ b/pending-rules/VideoLAN.xml
@@ -1,3 +1,6 @@
<ruleset name="VideoLAN">
+ <target host="videolan.org" />
+ <target host="www.videolan.org" />
+
<rule from="^http://(www\.)?videolan\.org/" to="https://www.videolan.org/"/>
</ruleset>
diff --git a/pending-rules/VirusTotal.xml b/pending-rules/VirusTotal.xml
index 12cd275..3de324a 100644
--- a/pending-rules/VirusTotal.xml
+++ b/pending-rules/VirusTotal.xml
@@ -1,3 +1,6 @@
<ruleset name="VirusTotal">
+ <target host="virustotal.com" />
+ <target host="www.virustotal.com" />
+
<rule from="^http://(www\.)?virustotal\.com/" to="https://www.virustotal.com/"/>
</ruleset>
diff --git a/pending-rules/Vodafone.xml b/pending-rules/Vodafone.xml
index 8ece9d2..a9df70b 100644
--- a/pending-rules/Vodafone.xml
+++ b/pending-rules/Vodafone.xml
@@ -1,4 +1,11 @@
<ruleset name="Vodafone">
+ <target host="vodafone.ie" />
+ <target host="www.vodafone.ie" />
+ <target host="online.vodafone.co.uk" />
+ <target host="shop.vodafone.co.uk" />
+ <target host="vodafone.co.nz" />
+ <target host="www.vodafone.co.nz" />
+
<rule from="^http://(www\.)?vodafone\.ie/" to="https://www.vodafone.ie/"/>
<rule from="^http://online\.vodafone\.co\.uk/"; to="https://online.vodafone.co.uk/"/>
<rule from="^http://shop\.vodafone\.co\.uk/"; to="https://shop.vodafone.co.uk/"/>
diff --git a/pending-rules/Vonage.xml b/pending-rules/Vonage.xml
index cea1c07..e605af7 100644
--- a/pending-rules/Vonage.xml
+++ b/pending-rules/Vonage.xml
@@ -1,4 +1,11 @@
<ruleset name="Vonage">
+ <target host="vonage.com" />
+ <target host="www.vonage.com" />
+ <target host="vonage.co.uk" />
+ <target host="www.vonage.co.uk" />
+ <target host="vonage.ca" />
+ <target host="www.vonage.ca" />
+
<rule from="^http://(www\.)?vonage\.com/" to="https://www.vonage.com/"/>
<rule from="^http://(www\.)?vonage\.co\.uk/" to="https://www.vonage.co.uk/"/>
<rule from="^http://(www\.)?vonage\.ca/" to="https://www.vonage.ca/"/>
diff --git a/pending-rules/Vuze.xml b/pending-rules/Vuze.xml
index 4cbdefd..230ac96 100644
--- a/pending-rules/Vuze.xml
+++ b/pending-rules/Vuze.xml
@@ -1,3 +1,6 @@
<ruleset name="Vuze">
+ <target host="vuze.com" />
+ <target host="www.vuze.com" />
+
<rule from="^http://(www\.)?vuze\.com/" to="https://www.vuze.com/"/>
</ruleset>
diff --git a/pending-rules/Web.de.xml b/pending-rules/Web.de.xml
index 6eae2a8..d631c9f 100644
--- a/pending-rules/Web.de.xml
+++ b/pending-rules/Web.de.xml
@@ -1,3 +1,6 @@
<ruleset name="Web.de">
+ <target host="web.de" />
+ <target host="www.web.de" />
+
<rule from="^http://(www\.)?web\.de/" to="https://www.web.de/"/>
</ruleset>
diff --git a/pending-rules/WhatCD.xml b/pending-rules/WhatCD.xml
index fcf3e92..f69e804 100644
--- a/pending-rules/WhatCD.xml
+++ b/pending-rules/WhatCD.xml
@@ -1,4 +1,6 @@
<ruleset name="WhatCD">
+ <target host="what.cd" />
+ <target host="www.what.cd" />
<rule from="^http://(www\.)?what\.cd/$" to="https://ssl.what.cd/"/>
diff --git a/pending-rules/WinPcap.xml b/pending-rules/WinPcap.xml
index 530ff60..ef67833 100644
--- a/pending-rules/WinPcap.xml
+++ b/pending-rules/WinPcap.xml
@@ -1,4 +1,7 @@
<ruleset name="WinPcap">
+ <target host="winpcap.org" />
+ <target host="www.winpcap.org" />
+
<rule from="^http://winpcap\.org/"; to="https://winpcap.org/"/>
<rule from="^http://www\.winpcap\.org/"; to="https://www.winpcap.org/"/>
</ruleset>
diff --git a/pending-rules/Wireshark.xml b/pending-rules/Wireshark.xml
index 2a5532a..640f493 100644
--- a/pending-rules/Wireshark.xml
+++ b/pending-rules/Wireshark.xml
@@ -1,4 +1,8 @@
<ruleset name="Wireshark">
+ <target host="wireshark.org" />
+ <target host="anonsvn.wireshark.org" />
+ <target host="www.wireshark.org" />
+
<rule from="^http://wireshark\.org/"; to="https://wireshark.org/"/>
<rule from="^http://(anonsvn|www)\.wireshark\.org/" to="https://$1.wireshark.org/"/>
</ruleset>
diff --git a/pending-rules/Woot.xml b/pending-rules/Woot.xml
index 2219c89..e9c27d8 100644
--- a/pending-rules/Woot.xml
+++ b/pending-rules/Woot.xml
@@ -1,3 +1,6 @@
<ruleset name="Woot">
+ <target host="woot.com" />
+ <target host="www.woot.com" />
+
<rule from="^http://(www\.)?woot\.com/" to="https://www.woot.com/"/>
</ruleset>
diff --git a/pending-rules/XOSkins.com.xml b/pending-rules/XOSkins.com.xml
index b3dfba2..8beac20 100644
--- a/pending-rules/XOSkins.com.xml
+++ b/pending-rules/XOSkins.com.xml
@@ -1,4 +1,7 @@
<ruleset name="XO Skins">
+ <target host="xoskins.com" />
+ <target host="www.xoskins.com" />
+
<rule from="^http://(www\.)?xoskins\.com/" to="https://xoskins.com/"/>
</ruleset>
diff --git a/pending-rules/XS4ALL.xml b/pending-rules/XS4ALL.xml
index 6ec6fd3..551aaac 100644
--- a/pending-rules/XS4ALL.xml
+++ b/pending-rules/XS4ALL.xml
@@ -1,4 +1,7 @@
<ruleset name="XS4ALL (partial)">
+ <target host="xs4all.nl" />
+ <target host="www.xs4all.nl" />
+
<exclusion pattern="^http://(www\.)?xs4all.nl/((%7E)|~)+"/>
<rule from="^http://(www\.)?xs4all\.nl/" to="https://www.xs4all.nl/"/>
</ruleset>
diff --git a/pending-rules/Xing.xml b/pending-rules/Xing.xml
index 8c3db28..a7ba782 100644
--- a/pending-rules/Xing.xml
+++ b/pending-rules/Xing.xml
@@ -1,3 +1,6 @@
<ruleset name="Xing">
+ <target host="xing.com" />
+ <target host="www.xing.com" />
+
<rule from="^http://(www\.)?xing\.com/" to="https://www.xing.com/"/>
</ruleset>
diff --git a/pending-rules/YFrog.xml b/pending-rules/YFrog.xml
index 73c683f..649592d 100644
--- a/pending-rules/YFrog.xml
+++ b/pending-rules/YFrog.xml
@@ -1,3 +1,6 @@
<ruleset name="YFrog">
+ <target host="yfrog.com" />
+ <target host="www.yfrog.com" />
+
<rule from="^http://(www\.)?yfrog\.com/" to="https://yfrog.com/"/>
</ruleset>
diff --git a/pending-rules/Your-Freedom.xml b/pending-rules/Your-Freedom.xml
index 79c2c1d..77475cb 100644
--- a/pending-rules/Your-Freedom.xml
+++ b/pending-rules/Your-Freedom.xml
@@ -1,3 +1,6 @@
<ruleset name="Your Freedom">
+ <target host="your-freedom.net" />
+ <target host="www.your-freedom.net" />
+
<rule from="^http://(www\.)?your-freedom\.net/" to="https://www.your-freedom.net/"/>
</ruleset>
diff --git a/pending-rules/Zimbra.xml b/pending-rules/Zimbra.xml
index 91489a6..191814c 100644
--- a/pending-rules/Zimbra.xml
+++ b/pending-rules/Zimbra.xml
@@ -1,4 +1,7 @@
<ruleset name="Zimbra">
+ <target host="zimbra.com" />
+ <target host="*.zimbra.com" />
+
<rule from="^http://zimbra\.com/"; to="https://www.zimbra.com/"/>
<rule from="^http://([^/:@]*)\.zimbra\.com/" to="https://$1.zimbra.com/"/>
</ruleset>
diff --git a/pending-rules/btjunkie.xml b/pending-rules/btjunkie.xml
index a54e3c7..648f175 100644
--- a/pending-rules/btjunkie.xml
+++ b/pending-rules/btjunkie.xml
@@ -1,4 +1,9 @@
<ruleset name="btjunkie">
+ <target host="btjunkie.org" />
+ <target host="www.btjunkie.org" />
+ <target host="dl.btjunkie.org" />
+ <target host="static.btjunkie.org" />
+
<rule from="^http://(dl|static)\.btjunkie\.org/" to="https://$1.btjunkie.org/"/>
<rule from="^https?://(www\.)?btjunkie\.org/" to="https://btjunkie.org/"/>
</ruleset>
diff --git a/pending-rules/eHow.xml b/pending-rules/eHow.xml
index c6bb0a9..363528f 100644
--- a/pending-rules/eHow.xml
+++ b/pending-rules/eHow.xml
@@ -1,3 +1,6 @@
<ruleset name="eHow">
+ <target host="ehow.com" />
+ <target host="www.ehow.com" />
+
<rule from="^http://(www\.)?ehow\.com/" to="https://www.ehow.com/"/>
</ruleset>
diff --git a/pending-rules/hi5.xml b/pending-rules/hi5.xml
index 33216f2..7a937b8 100644
--- a/pending-rules/hi5.xml
+++ b/pending-rules/hi5.xml
@@ -1,4 +1,7 @@
<ruleset name="hi5">
+ <target host="hi5.com" />
+ <target host="www.hi5.com" />
+
<rule from="^http://(www\.)?hi5\.com/" to="https://www.hi5.com/"/>
</ruleset>
diff --git a/pending-rules/so36.net.xml b/pending-rules/so36.net.xml
index 2fa5847..2089832 100644
--- a/pending-rules/so36.net.xml
+++ b/pending-rules/so36.net.xml
@@ -1,4 +1,7 @@
<ruleset name="so36.NET">
+ <target host="so36.net" />
+ <target host="*.so36.net" />
+
<rule from="^http://so36\.net/"; to="https://so36.net/"/>
<rule from="^http://([^/:@]*)\.so36\.net/" to="https://$1.so36.net/"/>
</ruleset>
diff --git a/pending-rules/uTorrent.xml b/pending-rules/uTorrent.xml
index 8abad42..fc65609 100644
--- a/pending-rules/uTorrent.xml
+++ b/pending-rules/uTorrent.xml
@@ -1,4 +1,9 @@
<ruleset name="uTorrent">
+ <target host="utorrent.com" />
+ <target host="www.utorrent.com" />
+ <target host="download.utorrent.com" />
+ <target host="forum.utorrent.com" />
+
<rule from="^https?://(www\.)?utorrent\.com/" to="https://www.utorrent.com/"/>
<rule from="^http://(download|forum)\.utorrent\.com/" to="https://$1.utorrent.com/"/>
</ruleset>
--
1.7.1