[tor-commits] [flashproxy/master] Merge branch 'rtmfp' of ssh://upload.bamsoftware.com/~dcf/flashproxy into rtmfp

[dcf at torproject.org]

commit 761a300ed9545faebcbfa35e06fb4369c06ae3dd
Merge: acd156a 9b7947e
Author: Nate Hardison <nate at dn0a208c2d.sunet>
Date:   Fri May 20 13:00:36 2011 -0700

    Merge branch 'rtmfp' of ssh://upload.bamsoftware.com/~dcf/flashproxy into rtmfp

 Makefile              |    4 +-
 README                |    9 ++
 badge.png             |  Bin 170 -> 264 bytes
 badge_con_counter.png |  Bin 0 -> 270 bytes
 connector.py          |  206 +++++++++++++++++++++++++++++++++----------------
 crossdomaind.py       |    1 -
 design.txt            |  164 +++++++++++++++++++++++++++++++++++++++
 facilitator.py        |  101 +++++++++++++++----------
 notes.txt             |    4 +
 reconnector.py        |    8 +-
 swfcat.as             |  115 ++++++++++++++++++++++++----
 11 files changed, 485 insertions(+), 127 deletions(-)