commit 30544586f8a98e985e0038b2e905bfddb14e999e Author: Georg Koppen gk@torproject.org Date: Tue May 29 19:40:31 2018 +0000

fixup! TB4: Tor Browser's Firefox preference overrides.

A fix for our bug 26127. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 8a187a8cefad..4289b7bcc5f9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -297,6 +297,9 @@ pref("xpinstall.whitelist.add.36", ""); // don't want to have some random Google Analytics script running either on the // about:addons page, see bug 22073 and 22900. pref("extensions.getAddons.showPane", false); +// Show our legacy extensions directly on about:addons and get rid of the +// warning for the default theme. +pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbutton@torproject.org,tor-launcher@torproject.org");

// Toolbar layout pref("browser.uiCustomization.state", "{"placements":{"PanelUI-contents":["edit-controls","zoom-controls","new-window-button","save-page-button","print-button","bookmarks-menu-button","history-panelmenu","find-button","preferences-button","add-ons-button","developer-button","https-everywhere-button","downloads-button"],"addon-bar":["addonbar-closebutton","status-bar"],"PersonalToolbar":["personal-bookmarks"],"nav-bar":["noscript-tbb","torbutton-button","urlbar-container","search-container","webrtc-status-button","loop-button"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button"],"toolbar-menubar":["menubar-items"]},"seen":[],"dirtyAreaCache":["PersonalToolbar","nav-bar","TabsToolbar","toolbar-menubar","PanelUI-contents","addon-bar"],"currentVersion":4,"newElementCount":0}");