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

[dcf at torproject.org]

commit d7f92def28704245e08033964cc8f98c55d3b568
Merge: c9df471 f6e2fb7
Author: David Fifield <david at bamsoftware.com>
Date:   Sun Jun 12 01:44:33 2011 -0700

    Merge branch 'rtmfp'
    
    Conflicts:
    	ProxyPair.as
    	swfcat.as

 Makefile       |    2 +-
 ProxyPair.as   |   72 ++++++++++---------
 README         |   77 +++++++++++++--------
 RTMFPSocket.as |  209 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 design.txt     |   19 ++++--
 swfcat.as      |  154 +++++++++++++++++++++++++++++++++++------
 6 files changed, 441 insertions(+), 92 deletions(-)