Verified Commit bef98d72 authored by Kathleen Brade's avatar Kathleen Brade Committed by Richard Pospesel
Browse files

Bug 28044: Integrate Tor Launcher into tor-browser 

Build and package Tor Launcher as part of the browser (similar to
how pdfjs is handled).

If a Tor Launcher extension is present in the user's profile, it is
removed.
parent b31600f8

.mozconfig

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,6 @@ ac_add_options --enable-proxy-bypass-protection 
# Disable telemetry

ac_add_options MOZ_TELEMETRY_REPORTING=



ac_add_options --disable-tor-launcher

ac_add_options --enable-tor-launcher

ac_add_options --with-tor-browser-version=dev-build

ac_add_options --disable-tor-browser-update

browser/extensions/moz.build

+3 −0
Original line number Diff line number Diff line
@@ -10,3 +10,6 @@ if CONFIG["NIGHTLY_BUILD"]: 
    DIRS += [

        "translations",

    ]



if not CONFIG["TOR_BROWSER_DISABLE_TOR_LAUNCHER"]:

    DIRS += ["tor-launcher"]

browser/installer/package-manifest.in

+5 −0
Original line number Diff line number Diff line
@@ -239,6 +239,11 @@ 
@RESPATH@/browser/chrome/browser.manifest

@RESPATH@/chrome/pdfjs.manifest

@RESPATH@/chrome/pdfjs/*

#ifndef TOR_BROWSER_DISABLE_TOR_LAUNCHER

@RESPATH@/browser/chrome/torlauncher.manifest

@RESPATH@/browser/chrome/torlauncher/*

@RESPATH@/browser/@PREF_DIR@/torlauncher-prefs.js

#endif

@RESPATH@/chrome/torbutton.manifest

@RESPATH@/chrome/torbutton/*

@RESPATH@/chrome/toolkit@JAREXT@

toolkit/mozapps/extensions/internal/XPIProvider.jsm

+10 −0
Original line number Diff line number Diff line
@@ -1485,6 +1485,16 @@ var XPIStates = { 
          continue;

        }



        // Since it is now part of the browser, uninstall the Tor Launcher

        // extension. This will remove the Tor Launcher .xpi from user

        // profiles on macOS.

        if (id === "tor-launcher@torproject.org") {

          logger.debug("Uninstalling the Tor Launcher extension.");

          loc.installer.uninstallAddon(id);

          changed = true;

          continue;

        }



        let xpiState = loc.get(id);

        if (!xpiState) {

          // If the location is not supported for sideloading, skip new