Verified Commit d2395afc authored by henry's avatar henry Committed by ma1
Browse files

fixup! TB 41435: Add a Tor Browser migration function

TB 43462: Drop preference for blocking internet tests since it no longer
requires Moat access.
parent 2ac7cd5f
Loading
Loading
Loading
Loading
+2 −0
Original line number Original line Diff line number Diff line
@@ -4804,6 +4804,7 @@ BrowserGlue.prototype = {
    //            since we hid the UI (tor-browser#43118).
    //            since we hid the UI (tor-browser#43118).
    // Version 6: Tor Browser 14.5a3: Clear preference for TorSettings that is
    // Version 6: Tor Browser 14.5a3: Clear preference for TorSettings that is
    //            no longer used (tor-browser#41921).
    //            no longer used (tor-browser#41921).
    //            Drop unused TorConnect setting (tor-browser#43462).
    const TBB_MIGRATION_VERSION = 6;
    const TBB_MIGRATION_VERSION = 6;
    const MIGRATION_PREF = "torbrowser.migration.version";
    const MIGRATION_PREF = "torbrowser.migration.version";


@@ -4888,6 +4889,7 @@ BrowserGlue.prototype = {


    if (currentVersion < 6) {
    if (currentVersion < 6) {
      Services.prefs.clearUserPref("torbrowser.settings.enabled");
      Services.prefs.clearUserPref("torbrowser.settings.enabled");
      Services.prefs.clearUserPref("torbrowser.bootstrap.allow_internet_test");
    }
    }


    Services.prefs.setIntPref(MIGRATION_PREF, TBB_MIGRATION_VERSION);
    Services.prefs.setIntPref(MIGRATION_PREF, TBB_MIGRATION_VERSION);