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

[dcf at torproject.org]

commit 486fba47f3bf851eb8549c03ff506fece4dc4818
Merge: e178468 0423ede
Author: ellitron <jdellit at stanford.edu>
Date:   Thu May 26 13:56:26 2011 -0700

    Merge remote branch 'origin/rtmfp' into rtmfp

 facilitator.py |  106 ++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 76 insertions(+), 30 deletions(-)