Verified Commit 6aac3873 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! Bug 40597: Implement TorSettings module 

Bug 41460: Removed references to the meek helper
parent 0561dad2

browser/modules/Moat.jsm

+0 −6
Original line number Diff line number Diff line
@@ -137,19 +137,13 @@ class MeekTransport { 


      // Setup env and start meek process

      let ptStateDir = TorLauncherUtil.getTorFile("tordatadir", false);

      let meekHelperProfileDir = TorLauncherUtil.getTorFile(

        "pt-profiles-dir",

        true

      );

      ptStateDir.append("pt_state"); // Match what tor uses.

      meekHelperProfileDir.appendRelativePath("profile.moat-http-helper");



      let envAdditions = {

        TOR_PT_MANAGED_TRANSPORT_VER: "1",

        TOR_PT_STATE_LOCATION: ptStateDir.path,

        TOR_PT_EXIT_ON_STDIN_CLOSE: "1",

        TOR_PT_CLIENT_TRANSPORTS: meekTransport,

        TOR_BROWSER_MEEK_PROFILE: meekHelperProfileDir.path,

      };

      if (TorSettings.proxy.enabled) {

        envAdditions.TOR_PT_PROXY = TorSettings.proxy.uri;