[tor-commits] [flashproxy/master] Merge branch 'transport'

[dcf at torproject.org]

commit 8e76ecea674f39f8bbe83b58965feaaaee07e9ea
Merge: 7d5f6f1 fee9038
Author: David Fifield <david at bamsoftware.com>
Date:   Mon Jan 28 02:06:37 2013 -0800

    Merge branch 'transport'
    
    Managed WebSocket server transport.

 .gitignore                              |    1 +
 README                                  |   27 +--
 init.d/websockify                       |   62 -----
 patches/websockify-binary-default.patch |   40 ---
 websocket-transport/Makefile            |   29 ++
 websocket-transport/pt.go               |  293 +++++++++++++++++++++
 websocket-transport/socks.go            |  107 ++++++++
 websocket-transport/websocket-server.go |  235 +++++++++++++++++
 websocket-transport/websocket.go        |  429 +++++++++++++++++++++++++++++++
 9 files changed, 1103 insertions(+), 120 deletions(-)

diff --cc .gitignore
index 4ee6b0c,3edea77..41e7192
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,4 +1,4 @@@
 -/facilitator.log
  *.pyc
  /dist
 +/pyinstaller-tmp
+ /websocket-transport/websocket-server