[HTTPS-E Rulesets] [EFForg/https-everywhere] d5f318: Merge branch 'master' into better-obs-whitelisting

[Peter Eckersley]

  Branch: refs/heads/async-better-whitelisting
  Home:   https://github.com/EFForg/https-everywhere
  Commit: d5f3181d8e5bf8e8d71a7153d5b9b7bd7f27b9d2
      https://github.com/EFForg/https-everywhere/commit/d5f3181d8e5bf8e8d71a7153d5b9b7bd7f27b9d2
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-05-16 (Fri, 16 May 2014)

  Changed paths:
    M chromium/_locales/en/messages.json
    M src/chrome/content/observatory-preferences.xul
    M src/chrome/content/observatory-xul.js
    M src/chrome/locale/ar/ssl-observatory.dtd
    M src/chrome/locale/bg/ssl-observatory.dtd
    M src/chrome/locale/cs/ssl-observatory.dtd
    M src/chrome/locale/da/ssl-observatory.dtd
    M src/chrome/locale/de/ssl-observatory.dtd
    M src/chrome/locale/el/ssl-observatory.dtd
    M src/chrome/locale/en/ssl-observatory.dtd
    M src/chrome/locale/es/ssl-observatory.dtd
    M src/chrome/locale/eu/ssl-observatory.dtd
    M src/chrome/locale/fa/ssl-observatory.dtd
    M src/chrome/locale/fi/ssl-observatory.dtd
    M src/chrome/locale/fr/ssl-observatory.dtd
    M src/chrome/locale/he/ssl-observatory.dtd
    M src/chrome/locale/hr/ssl-observatory.dtd
    M src/chrome/locale/hu/ssl-observatory.dtd
    M src/chrome/locale/it/ssl-observatory.dtd
    M src/chrome/locale/ja/ssl-observatory.dtd
    M src/chrome/locale/ko/ssl-observatory.dtd
    M src/chrome/locale/lt/ssl-observatory.dtd
    M src/chrome/locale/lv/ssl-observatory.dtd
    M src/chrome/locale/ms/ssl-observatory.dtd
    M src/chrome/locale/nb/ssl-observatory.dtd
    M src/chrome/locale/nl/ssl-observatory.dtd
    M src/chrome/locale/pl/ssl-observatory.dtd
    M src/chrome/locale/pt/ssl-observatory.dtd
    M src/chrome/locale/ru/ssl-observatory.dtd
    M src/chrome/locale/si/ssl-observatory.dtd
    M src/chrome/locale/sk/ssl-observatory.dtd
    M src/chrome/locale/sl/ssl-observatory.dtd
    M src/chrome/locale/sv/ssl-observatory.dtd
    M src/chrome/locale/tr/ssl-observatory.dtd
    M src/chrome/locale/zh-CN/ssl-observatory.dtd
    M src/chrome/locale/zh-TW/ssl-observatory.dtd
    M src/components/ssl-observatory.js
    M src/defaults/preferences/preferences.js

  Log Message:
  -----------
  Merge branch 'master' into better-obs-whitelisting


  Commit: 02ad1a1510aeaefd0ec5c377b911d2bd275cd9fe
      https://github.com/EFForg/https-everywhere/commit/02ad1a1510aeaefd0ec5c377b911d2bd275cd9fe
  Author: Peter Eckersley <pde at eff.org>
  Date:   2014-05-16 (Fri, 16 May 2014)

  Changed paths:
    M src/components/ssl-observatory.js

  Log Message:
  -----------
  Experimentally make the whitelist update async

This is ugly and untested


Compare: https://github.com/EFForg/https-everywhere/compare/d5f3181d8e5b^...02ad1a1510ae