[tor-commits] [flashproxy/master] Merge remote-tracking branch 'mytorgit/extor'

[dcf at torproject.org]

commit d54793cf1a5690b51546fbfa2fef94cca4881f4f
Merge: 84d83a2 866e8d5
Author: David Fifield <david at bamsoftware.com>
Date:   Sat Feb 2 19:35:55 2013 -0800

    Merge remote-tracking branch 'mytorgit/extor'
    
    External ORPort support for websocket-server (#7620).

 README                                  |    3 +
 websocket-transport/pt.go               |  294 ++++++++++++++++++++++++++++++-
 websocket-transport/websocket-server.go |    2 +-
 3 files changed, 296 insertions(+), 3 deletions(-)