Ticket #12776: 0001-Move-url-and-front-from-torrc-to-bridge_prefs.js.patch

File 0001-Move-url-and-front-from-torrc-to-bridge_prefs.js.patch, 4.1 KB (added by dcf, 5 years ago)
  • Bundle-Data/PTConfigs/bridge_prefs.js

    From cb601714bd6620e3b045cb105a09ae04779536e9 Mon Sep 17 00:00:00 2001
    From: David Fifield <david@bamsoftware.com>
    Date: Sat, 2 Aug 2014 08:20:58 +0000
    Subject: [PATCH] Move url and front from torrc to bridge_prefs.js.
    
    The alpha release uses tor 0.2.5, which can take these parameters on the
    Bridge line so they don't have to be part of the ClientTransportPlugin
    command.
    ---
     Bundle-Data/PTConfigs/bridge_prefs.js                 | 2 +-
     Bundle-Data/PTConfigs/linux/torrc-defaults-appendix   | 2 +-
     Bundle-Data/PTConfigs/mac/torrc-defaults-appendix     | 2 +-
     Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 2 +-
     4 files changed, 4 insertions(+), 4 deletions(-)
    
    diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js
    index b01ad07..9807302 100644
    a b pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.4 
    2929pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T");
    3030pref("extensions.torlauncher.default_bridge.scramblesuit.3", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH");
    3131
    32 pref("extensions.torlauncher.default_bridge.meek.1", "meek 0.0.2.0:1");
     32pref("extensions.torlauncher.default_bridge.meek.1", "meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com");
  • Bundle-Data/PTConfigs/linux/torrc-defaults-appendix

    diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix
    index 24f35ff..d019d19 100644
    a b ClientTransportPlugin obfs2,obfs3,scramblesuit exec ./TorBrowser/Tor/PluggableTr 
    1111ClientTransportPlugin flashproxy exec ./TorBrowser/Tor/PluggableTransports/flashproxy-client --register :0 :9000
    1212
    1313## meek configuration
    14 ClientTransportPlugin meek exec ./TorBrowser/Tor/PluggableTransports/meek-client-torbrowser -- ./TorBrowser/Tor/PluggableTransports/meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com
     14ClientTransportPlugin meek exec ./TorBrowser/Tor/PluggableTransports/meek-client-torbrowser -- ./TorBrowser/Tor/PluggableTransports/meek-client
  • Bundle-Data/PTConfigs/mac/torrc-defaults-appendix

    diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix
    index a4c3499..d6ec189 100644
    a b ClientTransportPlugin obfs2,obfs3,scramblesuit exec PluggableTransports/obfsprox 
    1212ClientTransportPlugin flashproxy exec PluggableTransports/flashproxy-client --register :0 :9000
    1313
    1414## meek configuration
    15 ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com
     15ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client
  • Bundle-Data/PTConfigs/windows/torrc-defaults-appendix

    diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix
    index 5c35ebb..f1b103d 100644
    a b ClientTransportPlugin obfs2,obfs3,scramblesuit exec TorBrowser\Tor\PluggableTran 
    1212ClientTransportPlugin flashproxy exec TorBrowser\Tor\PluggableTransports\flashproxy-client --register :0 :9000
    1313
    1414## meek configuration
    15 ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser --exit-on-stdin-eof -- TorBrowser\Tor\PluggableTransports\meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com
     15ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser --exit-on-stdin-eof -- TorBrowser\Tor\PluggableTransports\meek-client