Move tor settings to main

4 files changed, 7 insertions, 10 deletions

diff --git a/dev/packaging/tor/TorBrowser/Data/Browser/profile.default/extensions/librefox.http.watcher.tor@intika.be.xpi b/dev/packaging/tor/TorBrowser/Data/Browser/profile.default/extensions/librefox.http.watcher.tor@intika.be.xpi
deleted file mode 100644
index f060906..0000000
--- a/dev/packaging/tor/TorBrowser/Data/Browser/profile.default/extensions/librefox.http.watcher.tor@intika.be.xpi
+++ /dev/null
diff --git a/dev/packaging/tor/TorBrowser/Data/Browser/profile.default/extensions/{efd1ce61-97d1-4b4f-a378-67d0d41d858d}.xpi b/dev/packaging/tor/TorBrowser/Data/Browser/profile.default/extensions/{efd1ce61-97d1-4b4f-a378-67d0d41d858d}.xpi
deleted file mode 100644
index d15080c..0000000
--- a/dev/packaging/tor/TorBrowser/Data/Browser/profile.default/extensions/{efd1ce61-97d1-4b4f-a378-67d0d41d858d}.xpi
+++ /dev/null
diff --git a/dev/packaging/tor/TorBrowser/Data/Browser/profile.default/user.js b/dev/packaging/tor/TorBrowser/Data/Browser/profile.default/user.js
deleted file mode 100644
index 1a2dd5d..0000000
--- a/dev/packaging/tor/TorBrowser/Data/Browser/profile.default/user.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Librefox
-
-// Librefox Compatibility Fix
-user_pref("extensions.autoDisableScopes", 0);
-
-// Removing https-everywhere adding 2 librefox addons
-user_pref("extensions.enabledAddons", "librefox.http.watcher.tor%40intika.be:2.8,%7Befd1ce61-97d1-4b4f-a378-67d0d41d858d%7D:1.2,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,tor-launcher%40torproject.org:0.1.1pre-alpha,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5");
-
-// Icons arrangement
-user_pref("browser.uiCustomization.state", '{"placements":{"widget-overflow-fixed-list":[],"nav-bar":["back-button","forward-button","stop-reload-button","urlbar-container","downloads-button","_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action","_efd1ce61-97d1-4b4f-a378-67d0d41d858d_-browser-action","torbutton-button"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button"],"PersonalToolbar":["personal-bookmarks"],"PanelUI-contents":["home-button","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"],"addon-bar":["addonbar-closebutton","status-bar"]},"seen":["developer-button","_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action"],"dirtyAreaCache":["PersonalToolbar","nav-bar","TabsToolbar","toolbar-menubar"],"currentVersion":14,"newElementCount":3}');
diff --git a/settings/librewolf.cfg b/settings/librewolf.cfg
index 9b60c51..a0311f5 100644
--- a/settings/librewolf.cfg
+++ b/settings/librewolf.cfg
@@ -83,6 +83,13 @@ lockPref("general.config.filename", "librewolf.cfg");
 // Bench Diff : +0/5000
 // >>>>>>>>>>>>>>>>>>>>
 
+// Librefox Compatibility Fix
+user_pref("extensions.autoDisableScopes", 0);
+
+// Removing https-everywhere adding 2 librefox addons
+user_pref("extensions.enabledAddons", "librefox.http.watcher.tor%40intika.be:2.8,%7Befd1ce61-97d1-4b4f-a378-67d0d41d858d%7D:1.2,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,tor-launcher%40torproject.org:0.1.1pre-alpha,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5");
+
+
 // ----------------------------------------------------------------------------------------------------
 // User Settings : Cookies settings
 // ----------------------------------------------------------------------------------------------------