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

[dcf at torproject.org]

commit fbd9db7108ef0c9ee8209b056cb11346765c8f71
Merge: a529ed7 4f8e1e1
Author: David Fifield <david at bamsoftware.com>
Date:   Sat Mar 2 01:20:32 2013 -0800

    Merge branch 'poll_interval'

 facilitator/fac.py           |   20 +++++++++++++-------
 facilitator/facilitator      |   12 ++++++++++--
 facilitator/facilitator-test |    6 ++++++
 proxy/flashproxy.js          |   26 ++++++++++++++++++++------
 4 files changed, 49 insertions(+), 15 deletions(-)