[tbb-commits] [torbutton/maint-9.0] Merge remote-tracking branch 'richardtpo/bug_31855' into maint-9.0

sysrqb at torproject.org sysrqb at torproject.org
Fri Jan 3 20:38:36 UTC 2020


commit 7362d231508e4c0e78985d51672d3051ab209de4
Merge: ae1a9af4 0e5ac5d2
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Fri Jan 3 20:36:58 2020 +0000

    Merge remote-tracking branch 'richardtpo/bug_31855' into maint-9.0

 LICENSE                                        | 115 -------
 chrome.manifest                                |   5 -
 chrome/content/locale/non-localized.properties |   6 -
 chrome/content/preferences.xhtml               |   1 -
 chrome/content/tor-circuit-display.js          |  30 +-
 chrome/content/torbutton.js                    | 263 ++------------
 chrome/content/torbutton_util.js               |  79 -----
 chrome/locale/en-US/torbutton.dtd              |   3 +
 chrome/locale/en-US/torbutton.properties       |  10 +
 chrome/locale/ko/torbutton.dtd                 |  14 +-
 chrome/locale/ko/torbutton.properties          |   2 +-
 chrome/locale/lt/aboutDialog.dtd               |  19 +
 chrome/locale/lt/aboutTBUpdate.dtd             |   8 +
 chrome/locale/lt/aboutTor.dtd                  |  57 ++-
 chrome/locale/lt/brand.dtd                     |  15 +-
 chrome/locale/lt/brand.properties              |  17 +-
 chrome/locale/lt/browserOnboarding.properties  |  72 ++++
 chrome/locale/lt/torbutton.dtd                 |  66 +++-
 chrome/locale/lt/torbutton.properties          |  81 ++++-
 chrome/locale/ms/aboutDialog.dtd               |  19 +
 chrome/locale/ms/aboutTBUpdate.dtd             |   8 +
 chrome/locale/ms/aboutTor.dtd                  |  57 ++-
 chrome/locale/ms/brand.dtd                     |  15 +-
 chrome/locale/ms/brand.properties              |  17 +-
 chrome/locale/ms/browserOnboarding.properties  |  72 ++++
 chrome/locale/ms/torbutton.dtd                 |  65 +++-
 chrome/locale/ms/torbutton.properties          |  87 +++--
 chrome/locale/th/aboutDialog.dtd               |  19 +
 chrome/locale/th/aboutTBUpdate.dtd             |   8 +
 chrome/locale/th/aboutTor.dtd                  |  57 ++-
 chrome/locale/th/brand.dtd                     |  11 +-
 chrome/locale/th/brand.properties              |  13 +-
 chrome/locale/th/browserOnboarding.properties  |  72 ++++
 chrome/locale/th/torbutton.dtd                 |  65 +++-
 chrome/locale/th/torbutton.properties          |  85 +++--
 chrome/locale/tr/torbutton.properties          |   2 +-
 components/cookie-jar-selector.js              | 460 -------------------------
 components/domain-isolator.js                  |   3 -
 components/dragDropFilter.js                   |   2 -
 components/external-app-blocker.js             |  16 +-
 components/startup-observer.js                 |  19 +-
 components/torbutton-logger.js                 |   2 -
 defaults/preferences/preferences.js            |  58 ----
 import-translations.sh                         |   2 +-
 jar.mn                                         |  12 +-
 modules/default-prefs.js                       |  36 --
 modules/security-prefs.js                      |   1 +
 modules/tor-control-port.js                    |  95 ++++-
 modules/utils.js                               |  54 ++-
 moz.build                                      |   3 -
 50 files changed, 990 insertions(+), 1308 deletions(-)



More information about the tbb-commits mailing list