[HTTPS-E Rulesets] [EFForg/https-everywhere] b60d65: [BayFiles] Point .com to .net

Fri Sep 5 12:07:31 PDT 2014

  Branch: refs/heads/stable
  Home:   https://github.com/EFForg/https-everywhere
  Commit: b60d653df0b2aff0469cb5bffa1977267ae24240
      https://github.com/EFForg/https-everywhere/commit/b60d653df0b2aff0469cb5bffa1977267ae24240
  Author: MB <kunjurcca at gmail.com>
  Date:   2014-08-10 (Sun, 10 Aug 2014)

  Changed paths:
    M src/chrome/content/rules/BayFiles.xml

  Log Message:
  -----------
  [BayFiles] Point .com to .net

  Commit: 1d06a7b36d211c6ffd455ff588e1078b1d0e1339
      https://github.com/EFForg/https-everywhere/commit/1d06a7b36d211c6ffd455ff588e1078b1d0e1339
  Author: MB <kunjurcca at gmail.com>
  Date:   2014-08-10 (Sun, 10 Aug 2014)

  Changed paths:
    A src/chrome/content/rules/Outbrain.com-falsemixed.xml
    M src/chrome/content/rules/Outbrain.xml

  Log Message:
  -----------
  [Outbrain] Split false MCB coverage

Conflicts:
	src/chrome/content/rules/Outbrain.xml

  Commit: 8e450942dcd320f834b0c8389f556124e4a409c2
      https://github.com/EFForg/https-everywhere/commit/8e450942dcd320f834b0c8389f556124e4a409c2
  Author: MB <kunjurcca at gmail.com>
  Date:   2014-08-10 (Sun, 10 Aug 2014)

  Changed paths:
    M src/chrome/content/rules/Outbrain.com-falsemixed.xml

  Log Message:
  -----------
  [Outbrain] Update blog rule

blog now presents a valid cert and redirects to www.

Conflicts:
	src/chrome/content/rules/Outbrain-mismatches.xml

  Commit: 439959ec6138f0dd837d108ca68d5de5abdd5cb7
      https://github.com/EFForg/https-everywhere/commit/439959ec6138f0dd837d108ca68d5de5abdd5cb7
  Author: MB <kunjurcca at gmail.com>
  Date:   2014-08-10 (Sun, 10 Aug 2014)

  Changed paths:
    M src/chrome/content/rules/Qualys.xml

  Log Message:
  -----------
  [Qualys] Add special cases for laws and news

  Commit: c403e37726219874116de62cd7f34ec4231de528
      https://github.com/EFForg/https-everywhere/commit/c403e37726219874116de62cd7f34ec4231de528
  Author: MB <kunjurcca at gmail.com>
  Date:   2014-08-10 (Sun, 10 Aug 2014)

  Changed paths:
    M src/chrome/content/rules/OpenWRT.xml

  Log Message:
  -----------
  [OpenWRT] Remove git

As per comment.

Conflicts:
	src/chrome/content/rules/OpenWRT.xml

  Commit: 65175408a86502f6adf9e39635b1189a98bddd3e
      https://github.com/EFForg/https-everywhere/commit/65175408a86502f6adf9e39635b1189a98bddd3e
  Author: MB <kunjurcca at gmail.com>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M src/chrome/content/rules/Overclockers.com.xml

  Log Message:
  -----------
  [Overclockers.com] Add comments, disable

  Commit: bbabdf22686dfdb64c5783f83ab33934d4f29030
      https://github.com/EFForg/https-everywhere/commit/bbabdf22686dfdb64c5783f83ab33934d4f29030
  Author: MB <kunjurcca at gmail.com>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    A src/chrome/content/rules/Yahoo.com-falsemixed.xml
    A src/chrome/content/rules/Yahoo.com.tw.xml
    A src/chrome/content/rules/Yahoo.net-falsemixed.xml
    A src/chrome/content/rules/Yahoo.net.xml
    M src/chrome/content/rules/Yahoo.xml
    R src/chrome/content/rules/YahooNew.xml
    A src/chrome/content/rules/Yahoo_APIs.xml
    A src/chrome/content/rules/Yahoo_Japan.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/4.0' into 4.0

  Commit: ecd54585274e8f4dcd893899b1eb7f0f54522dd8
      https://github.com/EFForg/https-everywhere/commit/ecd54585274e8f4dcd893899b1eb7f0f54522dd8
  Author: MB <kunjurcca at gmail.com>
  Date:   2014-08-19 (Tue, 19 Aug 2014)

  Changed paths:
    M src/chrome/content/rules/Cisco.xml

  Log Message:
  -----------
  [Cisco] Point home and homesupport to support.linksys.com

Expired cert.

Conflicts:
	src/chrome/content/rules/Cisco.xml

  Commit: 14e781a38d5651fb5887097c27e23ee411217c33
      https://github.com/EFForg/https-everywhere/commit/14e781a38d5651fb5887097c27e23ee411217c33
  Author: MB <kunjurcca at gmail.com>
  Date:   2014-08-23 (Sat, 23 Aug 2014)

  Changed paths:
    A chromium/_locales/de/messages.json
    M chromium/manifest.json
    M src/Changelog
    M src/chrome/content/rules/Ning.xml
    M src/install.rdf

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/4.0' into 4.0

  Commit: 154e6cb0be6fd37e734b3059744541f5e1d482b9
      https://github.com/EFForg/https-everywhere/commit/154e6cb0be6fd37e734b3059744541f5e1d482b9
  Author: MB <kunjurcca at gmail.com>
  Date:   2014-08-23 (Sat, 23 Aug 2014)

  Changed paths:
    M src/chrome/content/rules/Zataz.xml

  Log Message:
  -----------
  [Zataz] Remove eromang

  Commit: d0732753f8015fb2afaaa0cee0dd48c3de760218
      https://github.com/EFForg/https-everywhere/commit/d0732753f8015fb2afaaa0cee0dd48c3de760218
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  These are ruleset ids, not names

  Commit: 851cfe55fd26f820abd2c0df868d4ba150c64a33
      https://github.com/EFForg/https-everywhere/commit/851cfe55fd26f820abd2c0df868d4ba150c64a33
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  Do not test inactive rulesets

  Commit: b177396e323820578ff6cb83a16c2d767bf0480a
      https://github.com/EFForg/https-everywhere/commit/b177396e323820578ff6cb83a16c2d767bf0480a
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  It's more accurate to test starting from HTTP

Some rulesets might not rewrite target domains' document roots, so
considered those to be mixed content is unfair.

  Commit: d38893bcba4bec5a2a0cfde72dc5b711961e21ee
      https://github.com/EFForg/https-everywhere/commit/d38893bcba4bec5a2a0cfde72dc5b711961e21ee
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M src/chrome/content/about.xul
    M src/install.rdf

  Log Message:
  -----------
  Bump version to 4.0.1

  Commit: d29e35a7690cc0d722bf158cfee8e7bdaf553cfa
      https://github.com/EFForg/https-everywhere/commit/d29e35a7690cc0d722bf158cfee8e7bdaf553cfa
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  Syntax error...

  Commit: b819b30fde40330b408c682cab012014b6912385
      https://github.com/EFForg/https-everywhere/commit/b819b30fde40330b408c682cab012014b6912385
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  typo

  Commit: 5d3cdaaafb62da406179c644b22879f92c6abe6a
      https://github.com/EFForg/https-everywhere/commit/5d3cdaaafb62da406179c644b22879f92c6abe6a
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  iterate correctly

  Commit: bf68b8da483d825048113060a376bb291a74ce6b
      https://github.com/EFForg/https-everywhere/commit/bf68b8da483d825048113060a376bb291a74ce6b
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  typo

  Commit: ccd83d47d6054b33d5f0d390f4a10d08f539259c
      https://github.com/EFForg/https-everywhere/commit/ccd83d47d6054b33d5f0d390f4a10d08f539259c
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M src/chrome/content/about.xul
    M src/chrome/content/ruleset-tests.js
    M src/install.rdf

  Log Message:
  -----------
  Merge remote-tracking branch 'github-pde/4.0' into 4.0

  Commit: b24153ac5e7b55c04cdec6e1dffb906e03a1ab58
      https://github.com/EFForg/https-everywhere/commit/b24153ac5e7b55c04cdec6e1dffb906e03a1ab58
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  RulesetsByID is more complicated than it used to be

It gets populated opportunistically as rulesets are read from the database...

  Commit: c93b6d0d5aa2de0596bfd2654e834f3e68c5c6d3
      https://github.com/EFForg/https-everywhere/commit/c93b6d0d5aa2de0596bfd2654e834f3e68c5c6d3
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  debugging

  Commit: 8a2eb6c634f629c1809934244be20220b00487fc
      https://github.com/EFForg/https-everywhere/commit/8a2eb6c634f629c1809934244be20220b00487fc
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'github-pde/4.0' into 4.0

  Commit: 656f44122a956dd71b3d2201df740e3814334d8f
      https://github.com/EFForg/https-everywhere/commit/656f44122a956dd71b3d2201df740e3814334d8f
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  [bugfix] ruleset tests: check for * targets correctly.

  Commit: 73266bedb1aa17a45f3aa80eb4018032ad285dfb
      https://github.com/EFForg/https-everywhere/commit/73266bedb1aa17a45f3aa80eb4018032ad285dfb
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  Test www.example.com in place of *.example.com

Also refactor the test target management a bit

  Commit: 8d703c50ac5dd53492788151e3cf3194a8ced6d4
      https://github.com/EFForg/https-everywhere/commit/8d703c50ac5dd53492788151e3cf3194a8ced6d4
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  These are ruleset ids, not names

  Commit: 77703927e253b4b18d5b84d1938609ed35597723
      https://github.com/EFForg/https-everywhere/commit/77703927e253b4b18d5b84d1938609ed35597723
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  Do not test inactive rulesets

  Commit: debabcd5ed1d60f8ece0218e4be39ca4b0435d4a
      https://github.com/EFForg/https-everywhere/commit/debabcd5ed1d60f8ece0218e4be39ca4b0435d4a
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  It's more accurate to test starting from HTTP

Some rulesets might not rewrite target domains' document roots, so
considered those to be mixed content is unfair.

  Commit: be63323b31f59ec045f71b19dd34e1d1e69fc46c
      https://github.com/EFForg/https-everywhere/commit/be63323b31f59ec045f71b19dd34e1d1e69fc46c
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M src/chrome/content/about.xul
    M src/install.rdf

  Log Message:
  -----------
  Bump version to 4.0.1

  Commit: c32b542a7f9f6d1bc6bbae11151c814badfba260
      https://github.com/EFForg/https-everywhere/commit/c32b542a7f9f6d1bc6bbae11151c814badfba260
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  RulesetsByID is more complicated than it used to be

It gets populated opportunistically as rulesets are read from the database...

  Commit: 55fb2421c03e098a95504cb8adf3af1f31a124ed
      https://github.com/EFForg/https-everywhere/commit/55fb2421c03e098a95504cb8adf3af1f31a124ed
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  debugging

  Commit: e18acc2d25b0560650e5dd9e65e652fae30e35d6
      https://github.com/EFForg/https-everywhere/commit/e18acc2d25b0560650e5dd9e65e652fae30e35d6
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  [bugfix] ruleset tests: check for * targets correctly.

  Commit: 7128bd3a04c3d716f1efc1bcfeb74ec553a8a74e
      https://github.com/EFForg/https-everywhere/commit/7128bd3a04c3d716f1efc1bcfeb74ec553a8a74e
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  Test www.example.com in place of *.example.com

Also refactor the test target management a bit

  Commit: c52b1f9afad0c499fd360c8737112f36180404a1
      https://github.com/EFForg/https-everywhere/commit/c52b1f9afad0c499fd360c8737112f36180404a1
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M makexpi.sh
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  Neaten, reduce unneeded verbosity

  Commit: 05ecc95a62b38f9ab9bc7930d92ca653c70cb993
      https://github.com/EFForg/https-everywhere/commit/05ecc95a62b38f9ab9bc7930d92ca653c70cb993
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  Handle wildcards in any position

  Commit: a6a6af8ece9b3ca5fd27de099dd8e7c05fc2ec50
      https://github.com/EFForg/https-everywhere/commit/a6a6af8ece9b3ca5fd27de099dd8e7c05fc2ec50
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  De-dupe test targets more comprehensively

  Commit: 5d58f40a01a8ac8de05403aebe101a93c3c8f2c8
      https://github.com/EFForg/https-everywhere/commit/5d58f40a01a8ac8de05403aebe101a93c3c8f2c8
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  Load the ruleset library once rather than incrementally

  Commit: d62314ab926279904563d4a7ac24039042241421
      https://github.com/EFForg/https-everywhere/commit/d62314ab926279904563d4a7ac24039042241421
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  Simplify

  Commit: c1880ab47c484e57351bc40b0e6b91ae99be777e
      https://github.com/EFForg/https-everywhere/commit/c1880ab47c484e57351bc40b0e6b91ae99be777e
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  Slash the number of backslashes

  Commit: fbabe8f8a2bb608996f7b98fcc39e4424ce465e5
      https://github.com/EFForg/https-everywhere/commit/fbabe8f8a2bb608996f7b98fcc39e4424ce465e5
  Author: Peter Eckersley <github at doorknob.dhs.org>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M makexpi.sh
    M src/chrome/content/about.xul
    M src/chrome/content/ruleset-tests.js
    M src/install.rdf

  Log Message:
  -----------
  Merge pull request #494 from EFForg/mcb-detection-test-enhancements

Enhancements to MCB detection tests (rebased)

  Commit: 6011c670d964ae1656756363a7f97eb4fc78b5c9
      https://github.com/EFForg/https-everywhere/commit/6011c670d964ae1656756363a7f97eb4fc78b5c9
  Author: Sam Reed <sam at reedyboy.net>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M src/chrome/content/rules/Wikimedia.xml

  Log Message:
  -----------
  [Wikimedia] Fix arbcom.(de|en|fi|nl) subdomains

Should be arbcom-$1 not wg-$1

  Commit: 14eb15df08ca1d6a45938500fdc4479969121ba0
      https://github.com/EFForg/https-everywhere/commit/14eb15df08ca1d6a45938500fdc4479969121ba0
  Author: MB <kunjurcca at gmail.com>
  Date:   2014-09-03 (Wed, 03 Sep 2014)

  Changed paths:
    M src/chrome/content/rules/Immunityinc.com.xml

  Log Message:
  -----------
  [Immunityinc.com] Add comments

  Commit: ac0b5e405c3d4ea487f477c7ecae21f5dbfbc198
      https://github.com/EFForg/https-everywhere/commit/ac0b5e405c3d4ea487f477c7ecae21f5dbfbc198
  Author: MB <kunjurcca at gmail.com>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M src/chrome/content/rules/MyFonts.com.xml

  Log Message:
  -----------
  [MyFonts.com] Point cdn to cloudfront

  Commit: 846283e31d0eb48663ace66d3f11aea02ffc6e2f
      https://github.com/EFForg/https-everywhere/commit/846283e31d0eb48663ace66d3f11aea02ffc6e2f
  Author: MB <kunjurcca at gmail.com>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    A src/chrome/content/rules/Alipay.com-noscript.xml
    M src/chrome/content/rules/Alipay.com.xml

  Log Message:
  -----------
  [Alipay.com] Split coverage subject to js loop

https://trac.torproject.org/projects/tor/ticket/12263

Conflicts:
	src/chrome/content/rules/Alipay.com.xml

  Commit: cc6c1a4628ffafa8896c06b5dae5aaeffd6a36f2
      https://github.com/EFForg/https-everywhere/commit/cc6c1a4628ffafa8896c06b5dae5aaeffd6a36f2
  Author: MB <kunjurcca at gmail.com>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M src/chrome/content/rules/DigitalForensicsMagazine.xml

  Log Message:
  -----------
  [DigitalForensicsMagazine] Add comments

wrt https://github.com/EFForg/https-everywhere/issues/529

  Commit: 0f3adb6811013385a7bf75eaa575cf0e0b0c2132
      https://github.com/EFForg/https-everywhere/commit/0f3adb6811013385a7bf75eaa575cf0e0b0c2132
  Author: MB <kunjurcca at gmail.com>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M src/chrome/content/rules/Dynamite-Data.xml

  Log Message:
  -----------
  [Dynamite Data] Add comments

wrt https://github.com/EFForg/https-everywhere/issues/529

  Commit: 487e90c72e44866c7e1b6f777cbfa821537e1d54
      https://github.com/EFForg/https-everywhere/commit/487e90c72e44866c7e1b6f777cbfa821537e1d54
  Author: MB <kunjurcca at gmail.com>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M src/chrome/content/rules/KarwansarayPublishers.xml
    A src/chrome/content/rules/Karwansaray_Publishers.com-falsemixed.xml

  Log Message:
  -----------
  [Karwansaray Publishers] Split false MCB coverage

wrt https://github.com/EFForg/https-everywhere/issues/529

  Commit: 5336c002bed32d9bbbc8f0cf007487f21469ac8d
      https://github.com/EFForg/https-everywhere/commit/5336c002bed32d9bbbc8f0cf007487f21469ac8d
  Author: MB <kunjurcca at gmail.com>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M src/chrome/content/rules/Norman.com.xml

  Log Message:
  -----------
  [Norman.com] Add comment

wrt https://github.com/EFForg/https-everywhere/issues/529

  Commit: fb07a31f1f530c7d2d839cf2c240898d4807de1e
      https://github.com/EFForg/https-everywhere/commit/fb07a31f1f530c7d2d839cf2c240898d4807de1e
  Author: MB <kunjurcca at gmail.com>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M src/chrome/content/rules/Waffles.fm.xml

  Log Message:
  -----------
  [Waffles.fm] Add comment

wrt https://github.com/EFForg/https-everywhere/issues/529

  Commit: f2685234b0b837d0259b252747c438d0e9b0fb26
      https://github.com/EFForg/https-everywhere/commit/f2685234b0b837d0259b252747c438d0e9b0fb26
  Author: MB <kunjurcca at gmail.com>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M src/chrome/content/about.xul
    M src/chrome/content/ruleset-tests.js
    M src/install.rdf

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/4.0' into 4.0

  Commit: 83e95ca304dcb40f15f6e0b388243ad98365bdec
      https://github.com/EFForg/https-everywhere/commit/83e95ca304dcb40f15f6e0b388243ad98365bdec
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-09-05 (Fri, 05 Sep 2014)

  Changed paths:
    A src/chrome/content/rules/Alipay.com-noscript.xml
    M src/chrome/content/rules/Alipay.com.xml
    M src/chrome/content/rules/DigitalForensicsMagazine.xml
    M src/chrome/content/rules/Dynamite-Data.xml
    M src/chrome/content/rules/Immunityinc.com.xml
    M src/chrome/content/rules/KarwansarayPublishers.xml
    A src/chrome/content/rules/Karwansaray_Publishers.com-falsemixed.xml
    M src/chrome/content/rules/MyFonts.com.xml
    M src/chrome/content/rules/Norman.com.xml
    M src/chrome/content/rules/Waffles.fm.xml
    M src/chrome/content/ruleset-tests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'negres/4.0' into 4.0

Conflicts:
	src/chrome/content/ruleset-tests.js

Compare: https://github.com/EFForg/https-everywhere/compare/ea55eddcadfb...83e95ca304dc