commit 9b43d64be7a6b6d11f33a632030dfc020dc8f0ac Merge: 57c2678 8cac767 Author: David Fifield david@bamsoftware.com Date: Thu May 26 22:11:17 2011 -0700

Merge branch 'master' into rtmfp

Conflicts: README swfcat.as

README | 4 +- connector.py | 89 +++++++++++++++++++++------------------ swfcat.as | 53 +++++++++++++++--------- tor-ignore-bridge-failure.diff | 19 ++++++++ 4 files changed, 102 insertions(+), 63 deletions(-)

diff --cc README index 17fadf5,067f92e..afae925 --- a/README +++ b/README @@@ -39,16 -29,14 +39,16 @@@ Download the (free software) Flex SDK Put its bin directory in your PATH. The important executable is mxmlc. To build, run $ make -Copy the resulting swfcat.swf file to a web server. +Copy the resulting rtmfpcat.swf file to a web server.

On the computer that will be the facilitator, run - sudo ./crossdomaind.py - ./facilitator.py + sudo ./crossdomaind.py + ./facilitator.py crossdomaind.py needs to be run on any server that will accept connections from a Flash proxy. It serves a chunk of data on port 843. -The facilitator runs on port 9002 by default. +The facilitator runs on port 9002 by default. Note that this is a different +facilitator script than the swfcat one, since this facilitator needs to +deal with Cirrus client IDs instead of ip:port tuples.

The client needs to be running a version of Tor that supports the Socks4Proxy configuration. This means version 0.2.2.1-alpha or