Merge branch 'release' of github.com:EFForg/https-everywhere into cliqzMaster

Author: luciancor

chromium/manifest.json

@@ -6,7 +6,7 @@
     }, 
     "author": {
         "email": "eff.software.projects@gmail.com"
-    },
+    }, 
     "background": {
         "scripts": [
             "rules.js", 
@@ -15,35 +15,35 @@
             "background.js", 
             "incognito-cache-clearing.js"
         ]
-    },
+    }, 
     "browser_action": {
         "default_icon": {
-          "38": "icons/icon-active-38.png"
-        },
-        "default_popup": "popup.html",
+            "38": "icons/icon-active-38.png"
+        }, 
+        "default_popup": "popup.html", 
         "default_title": "__MSG_about_ext_name__"
-    },
-    "default_locale": "en",
-    "description": "__MSG_about_ext_description__",
-    "devtools_page": "devtools.html",
-    "homepage_url": "https://www.eff.org/https-everywhere",
+    }, 
+    "default_locale": "en", 
+    "description": "__MSG_about_ext_description__", 
+    "devtools_page": "devtools.html", 
+    "homepage_url": "https://www.eff.org/https-everywhere", 
     "icons": {
-        "48": "icons/icon-active-48.png",
-        "128": "icons/icon-active-128.png"
-    },
-    "incognito": "spanning",
-    "manifest_version": 2,
-    "minimum_chrome_version": "45",
-    "name": "__MSG_about_ext_name__",
+        "128": "icons/icon-active-128.png", 
+        "48": "icons/icon-active-48.png"
+    }, 
+    "incognito": "spanning", 
+    "manifest_version": 2, 
+    "minimum_chrome_version": "45", 
+    "name": "__MSG_about_ext_name__", 
     "permissions": [
-        "webNavigation",
-        "webRequest",
-        "webRequestBlocking",
-        "tabs",
-        "cookies",
-        "storage",
+        "webNavigation", 
+        "webRequest", 
+        "webRequestBlocking", 
+        "tabs", 
+        "cookies", 
+        "storage", 
         "<all_urls>"
     ], 
     "update_url": "https://www.eff.org/files/https-everywhere-chrome-updates.xml", 
-    "version": "2016.6.9"
-}
+    "version": "2016.7.19"
+}

chromium/popup.html

@@ -25,7 +25,7 @@ <h1 i18n="about_ext_name"></h1>
 </section>
 <section id="HttpNowhere" class="options">
     <input id="http-nowhere-checkbox" type="checkbox" value="httpNowhere"/>
-    <label i18n="menu_blockHttpRequests" for="http-nowhere-checkbox"></label>
+    <label i18n="menu_blockUnencryptedRequests" for="http-nowhere-checkbox"></label>
 </section>
 
 <div id="RuleManagement">

ruleset-style.md

@@ -7,19 +7,19 @@ To that end, here are some style guidelines for writing or modifying rulesets.
 They are intended to help and simplify in places where choices are ambiguous,
 but like all guidelines they can be broken if the circumstances require it.
 
-Avoid using the left-wildcard ("<target host='*.example.com'>") unless
+Avoid using the left-wildcard (`<target host='*.example.com' />`) unless
 you intend to rewrite all or nearly all subdomains.  Many rules today specify
 a left-wildcard target, but the rewrite rules only rewrite an explicit list
 of hostnames.
 
-Instead, prefer listing explicit target hosts and a single rewrite from "^http:" to
-"^https:". This saves you time as a ruleset author because each explicit target
+Instead, prefer listing explicit target hosts and a single rewrite from `"^http:"` to
+`"^https:"`. This saves you time as a ruleset author because each explicit target
 host automatically creates an implicit test URL, reducing the need to add your
 own test URLs. These also make it easier for someone reading the ruleset to figure out
 which subdomains are covered.
 
 If you know all subdomains of a given domain support HTTPS, go ahead and use a
-left-wildcard, along with a plain rewrite from "^http:" to "^https:". Make sure
+left-wildcard, along with a plain rewrite from `"^http:"` to `"^https:"`. Make sure
 to add a bunch of test URLs for the more important subdomains. If you're not
 sure what subdomains might exist, you can iteratively use google queries and enumerate
 the list of results like such:
@@ -31,16 +31,16 @@ the list of results like such:
 ... and so on.
 
 If there are a handful of tricky subdomains, but most subdomains can handle the
-plain rewrite from "^http:" to "^https:", specify the rules for the tricky
+plain rewrite from `"^http:"` to `"^https:"`, specify the rules for the tricky
 subdomains first, and then then plain rule last. Earlier rules will take
 precedence, and processing stops at the first matching rule. There may be a tiny
 performance hit for processing exception cases earlier in the ruleset and the
 common case last, but in most cases the performance issue is trumped by readability.
 
-Avoid regexes with long strings of subdomains, e.g. &lt;rule
-from="^http://(foo|bar|baz|bananas).example.com" /&gt;. These are hard to read and
+Avoid regexes with long strings of subdomains, e.g. `<rule
+from="^http://(foo|bar|baz|bananas).example.com" />`. These are hard to read and
 maintain, and are usually better expressed with a longer list of target hosts,
-plus a plain rewrite from "^http:" to "^https:".
+plus a plain rewrite from `"^http:"` to `"^https:"`.
 
 Prefer dashes over underscores in filenames. Dashes are easier to type.
 
@@ -80,30 +80,29 @@ Here is an example ruleset pre-style guidelines:
 
   <rule from="^http://((?:developers|html-differences|images|resources|\w+\.spec|wiki|www)\.)?whatwg\.org/"
     to="https://$1whatwg.org/" />
-
 </ruleset>
 ```
 
 Here is how you could rewrite it according to these style guidelines, including
 test URLs:
+
 ```
 <ruleset name="WHATWG.org">
-  <target host="whatwg.org" />
-  <target host="developers.whatwg.org" />
-  <target host="html-differences.whatwg.org" />
-  <target host="images.whatwg.org" />
-  <target host="resources.whatwg.org" />
-  <target host="*.spec.whatwg.org" />
-  <target host="wiki.whatwg.org" />
-  <target host="www.whatwg.org" />
-
-  <test url="http://html.spec.whatwg.org/" />
-  <test url="http://fetch.spec.whatwg.org/" />
-  <test url="http://xhr.spec.whatwg.org/" />
-  <test url="http://dom.spec.whatwg.org/" />
-
-  <rule from="^http:"
-          to="https:" />
-
+	<target host="whatwg.org" />
+	<target host="developers.whatwg.org" />
+	<target host="html-differences.whatwg.org" />
+	<target host="images.whatwg.org" />
+	<target host="resources.whatwg.org" />
+	<target host="*.spec.whatwg.org" />
+	<target host="wiki.whatwg.org" />
+	<target host="www.whatwg.org" />
+
+	<test url="http://html.spec.whatwg.org/" />
+	<test url="http://fetch.spec.whatwg.org/" />
+	<test url="http://xhr.spec.whatwg.org/" />
+	<test url="http://dom.spec.whatwg.org/" />
+
+	<rule from="^http:"
+		to="https:" />
 </ruleset>
-
+```

ruleset-testing.md

@@ -37,8 +37,8 @@ target host with a right-side wildcard. But this is not yet implemented.
       <test url="http://www.example.com/" />
       <test url="http://beta.example.com/" />
 
-      <rule from="^http://([\w-]+\.)?dezeen\.com/"
-          to="https://$1dezeen.com/" />
+      <rule from="^http://([\w-]+\.)?example\.com/"
+          to="https://$1example.com/" />
 
     </ruleset>
 
@@ -50,7 +50,7 @@ using explicit &lt;test&gt; tags.
 
 # Testing and Continuous Build
 
-Testing for rulest coverage is now part of the Travis CI continuous build.
+Testing for ruleset coverage is now part of the Travis CI continuous build.
 Currently we only test rulesets that have been modified since February 2 2015.
 Submitting changes to any ruleset that does not meet the coverage requirements
 will break the build. This means that even fixes of existing rules may require

src/Changelog

@@ -1,3 +1,14 @@
+Firefox 5.2.1
+  * Bugfix release: fix CSS to prevent large icons
+
+Chrome 2016.7.19
+  * New release fixing icon inclusion problem
+
+Firefox 5.2.0 / Chrome 2016.7.18
+  * Ruleset fixes
+  * Updating icons
+  * 'Block all unencrypted requests' now allows requests to .onion addresses
+
 Firefox 5.1.10 / Chrome 2016.6.9
   * Ruleset fixes
   * Fixing Tor Browser race condition