[tor-commits] [tor-browser-bundle/master] Add an option to use meek through CloudFront.

[mikeperry at torproject.org]

commit f9b9e2420072dff2b49ef45b8fa4e0aae1ff59ae
Author: David Fifield <david at bamsoftware.com>
Date:   Sat Aug 2 08:27:39 2014 +0000

    Add an option to use meek through CloudFront.
    
    I don't know the best way to handle this in the UI. I added two
    transports, meek-google and meek-amazon, that will appear in the
    selection menu.
---
 Bundle-Data/PTConfigs/bridge_prefs.js |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js
index 9807302..b04e84e 100644
--- a/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -29,4 +29,5 @@ pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.4
 pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T");
 pref("extensions.torlauncher.default_bridge.scramblesuit.3", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH");
 
-pref("extensions.torlauncher.default_bridge.meek.1", "meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com");
+pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com");
+pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");