[or-cvs] [https-everywhere/master 287/291] restore twimg rewrite rule

[schoen@xxxxxxxxxxxxxx]

Author: Seth Schoen <schoen@xxxxxxx>
Date: Fri, 29 Oct 2010 16:11:18 -0700
Subject: restore twimg rewrite rule
Commit: a92b78e113d41a7b9bf7649b2ebce637ca05fe89

---
 src/chrome/content/rules/Twitter.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/chrome/content/rules/Twitter.xml b/src/chrome/content/rules/Twitter.xml
index 596a9d6..9f6e62a 100644
--- a/src/chrome/content/rules/Twitter.xml
+++ b/src/chrome/content/rules/Twitter.xml
@@ -8,11 +8,11 @@
      E.g. platform.twitter.com has some scripts, but the https version
      won't validate. -->
 
+<!-- The twimg rule triggers the favicon bug a lot but it's not clear
+     that it makes the site unusable or particularly broken. -->
+
 <ruleset name="Twitter">
   <rule from="^http://(www\.)?twitter\.com/" to="https://twitter.com/"/>
   <rule from="^http://(search|static)\.twitter\.com/" to="https://$1.twitter.com/"/>
-  <!-- leave this twimg rule out until we've sorted out the bug where some
-       images are confused with favicons -->
-  <!-- from="^http://[a-z0-9].?\.twimg\.com/";
-  to="https://s3.amazonaws.com/twitter_production/"; -->
+  <rule from="^http://[a-z0-9].?\.twimg\.com/"; to="https://s3.amazonaws.com/twitter_production/"/>
 </ruleset>
-- 
1.7.1