Merge release to esr68. a=merge
FENNEC_68_0_BUILD3 FENNEC_68_0_RELEASE FIREFOX_68_0esr_BUILD2 FIREFOX_68_0esr_RELEASE
Merge release to esr68. a=merge
--- a/modules/libpref/init/StaticPrefList.h
+++ b/modules/libpref/init/StaticPrefList.h
@@ -2405,17 +2405,16 @@ VARCACHE_PREF(
VARCACHE_PREF(
"browser.contentblocking.rejecttrackers.control-center.ui.enabled",
browser_contentblocking_rejecttrackers_control_center_ui_enabled,
bool, false
)
VARCACHE_PREF(
- Live,
"privacy.file_unique_origin",
privacy_file_unique_origin,
bool, true
)
// Annotate trackers using the strict list. If set to false, the basic list will
// be used instead.
#ifdef EARLY_BETA_OR_EARLIER