[tor-commits] [flashproxy/master] Merge branch 'master' of http://www.bamsoftware.com/git/jscat

[dcf at torproject.org]

commit f346b59702f05d60d891398a4879fbf4254f7605
Merge: 858801c 1f76c4a
Author: Nate Hardison <nate at rescomp-09-154551.stanford.edu>
Date:   Mon May 9 14:43:54 2011 -0700

    Merge branch 'master' of http://www.bamsoftware.com/git/jscat

 .gitignore      |    2 +-
 README          |   20 +++--
 connector.py    |  178 +++++++++++++++++++++++++++++++++++++----
 crossdomain.xml |  Bin 91 -> 0 bytes
 facilitator.py  |   26 ++++--
 notes.txt       |    5 +
 reconnector.py  |   98 +++++++++++++++++++++++
 swfcat.as       |  237 +++++++++++++++++++++++++++++++++++--------------------
 8 files changed, 444 insertions(+), 122 deletions(-)