commit 5641086e79f9c9dbb89ce510d0def4871dabf0b7 Author: David Fifield david@bamsoftware.com Date: Fri Oct 17 09:18:16 2014 -0700

Give priority to the bridge-params config style.

Most people who have meek these days will have tor 0.2.5, which can use the superior per-bridgeline configuration style. --- appengine/README | 8 ++++---- meek-client/meek-client.go | 4 ++-- meek-client/torrc | 17 +++++++++-------- meek-server/README | 2 +- php/README | 4 ++-- wsgi/README | 4 ++-- 6 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/appengine/README b/appengine/README index db91691..fe489f5 100644 --- a/appengine/README +++ b/appengine/README @@ -11,8 +11,8 @@ To test locally, run The app will be running at http://127.0.0.1:8080/. To configure meek-client to talk to the locally running app, put this in torrc: UseBridges 1 - Bridge meek 0.0.2.0:1 - ClientTransportPlugin meek exec ./meek-client --url=http://127.0.0.1:8080/ --log meek-client.log + Bridge meek 0.0.2.0:1 url=http://127.0.0.1:8080/ + ClientTransportPlugin meek exec ./meek-client --log meek-client.log

To deploy to App Engine, create a Google Account and use it to create a new app with a unique name. Edit the "application:" line of app.yaml to @@ -21,5 +21,5 @@ refer to your app's name. Run To configure meek-client to talk to the App Engine app, give the app's name as the url and "www.google.com" as the front domain. UseBridges 1 - Bridge meek 0.0.2.0:1 - ClientTransportPlugin meek exec ./meek-client --url=https://yourapphere.appspot.com/ --front=www.google.com --log meek-client.log + Bridge meek 0.0.2.0:1 url=https://yourapphere.appspot.com/ front=www.google.com + ClientTransportPlugin meek exec ./meek-client --log meek-client.log diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 447e785..dd4a7f4 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -20,8 +20,8 @@ // is the same as this one using command line options: // Bridge meek 0.0.2.0:1 // ClientTransportPlugin meek exec ./meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com -// The advantage of SOCKS args is that multiple Bridge lines can have different -// configurations, but it requires a newer tor. +// The command-line configuration interface is for compatibility with tor 0.2.4 +// and older, which doesn't support parameters on Bridge lines. // // The --helper option prevents this program from doing any network operations // itself. Rather, it will send all requests through a browser extension that diff --git a/meek-client/torrc b/meek-client/torrc index 0e2efec..e7b297a 100644 --- a/meek-client/torrc +++ b/meek-client/torrc @@ -5,13 +5,14 @@ UseBridges 1 # Socks5Proxy localhost:1080 # HTTPSProxy localhost:8080

-Bridge meek 0.0.2.0:1 -ClientTransportPlugin meek exec ./meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log +Bridge meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com +Bridge meek 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com +Bridge meek 0.0.2.0:3 url=https://az668014.vo.msecnd.net/ front=ajax.aspnetcdn.com +ClientTransportPlugin meek exec ./meek-client --log meek-client.log + +# With tor 0.2.4 or earlier, you have to configure the url and front on the +# command line, and you can only use one url/front combination at a time: +# Bridge meek 0.0.2.0:1 +# ClientTransportPlugin meek exec ./meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log # ClientTransportPlugin meek exec ./meek-client --url=https://d2zfqthxsdq309.cloudfront.net/ --front=a0.awsstatic.com --log meek-client.log # ClientTransportPlugin meek exec ./meek-client --url=https://az668014.vo.msecnd.net/ --front=ajax.aspnetcdn.com --log meek-client.log - -# With tor 0.2.5 you can do it this way: -# Bridge meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com -# Bridge meek 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com -# Bridge meek 0.0.2.0:3 url=https://az668014.vo.msecnd.net/ front=ajax.aspnetcdn.com -# ClientTransportPlugin meek exec ./meek-client --log meek-client.log diff --git a/meek-server/README b/meek-server/README index d49d9ca..84ea4fb 100644 --- a/meek-server/README +++ b/meek-server/README @@ -11,7 +11,7 @@

- To test your bridge on the clinet side, you can add a line like this to your torrc:

- Bridge meek 0.0.2.0:3 url=http://my-bridge.example.com:7002/ + Bridge meek 0.0.2.0:1 url=http://my-bridge.example.com:7002/

# Important Note:

diff --git a/php/README b/php/README index 1df27d5..88063de 100644 --- a/php/README +++ b/php/README @@ -9,5 +9,5 @@ To test locally, run: The app will be running at http://127.0.0.1:8080/. To configure meek-client to talk to the locally running app, put this in torrc: UseBridges 1 - Bridge meek 0.0.2.0:1 - ClientTransportPlugin meek exec ./meek-client --url=http://127.0.0.1:8080/ --log meek-client.log \ No newline at end of file + Bridge meek 0.0.2.0:1 url=http://127.0.0.1:8080/ + ClientTransportPlugin meek exec ./meek-client --log meek-client.log diff --git a/wsgi/README b/wsgi/README index a0e55b2..85a430e 100644 --- a/wsgi/README +++ b/wsgi/README @@ -6,5 +6,5 @@ To test locally, run:

It will listen on port 8000. Configure tor as: UseBridges 1 - Bridge meek 0.0.2.0:1 - ClientTransportPlugin meek exec ./meek-client --url=http://127.0.0.1:8000/ + Bridge meek 0.0.2.0:1 url=http://127.0.0.1:8000/ + ClientTransportPlugin meek exec ./meek-client --log meek-client.log