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

[dcf at torproject.org]

commit 58af9ccdd5a264080c4df7dec4f9894f490ee12b
Merge: 147a34c 81bad6e
Author: David Fifield <david at bamsoftware.com>
Date:   Sat Jun 11 12:18:55 2011 -0700

    Merge branch 'master' into rtmfp
    
    Conflicts:
    	README

 README         |    6 +-
 facilitator.py |   34 ++++++++---
 notes.txt      |    4 -
 reconnector.py |  179 --------------------------------------------------------
 4 files changed, 28 insertions(+), 195 deletions(-)