commit 83ffac02803b5f354f02edbe122e8df515fdf756 Author: Ximin Luo infinity0@torproject.org Date: Fri Jun 27 17:42:56 2014 +0100

fix incorrect transport name in obfs3_flashproxy, which was causing flashproxy registration to fail --- obfs-flash-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/obfs-flash-client b/obfs-flash-client index 7fae6b8..34f01d7 100755 --- a/obfs-flash-client +++ b/obfs-flash-client @@ -410,7 +410,7 @@ def obfs3_flashproxy(reactor, client, callback_port, fp_remote, fp_args=[], fp_l ob_client = os.getenv("OBFSPROXY", "obfsproxy") fp_client = os.getenv("FLASHPROXY_CLIENT", "flashproxy-client")

- fp_cmdline = [fp_client, "--transport", '"obfs3|websocket"'] + fp_args + ['127.0.0.1:%s' % fp_local, fp_remote] + fp_cmdline = [fp_client, "--transport", 'obfs3|websocket'] + fp_args + ['127.0.0.1:%s' % fp_local, fp_remote] obfs_cmd_line = [ob_client, "managed"]

transport_map = {'obfs3': obfs_cmd_line, 'flashproxy': fp_cmdline}