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

[infinity0 at torproject.org]

commit 2c8c346bf4137c24bf3f75b8ecf33d3fa3d82b1d
Merge: 4170079 555e57d
Author: Ximin Luo <infinity0 at gmx.com>
Date:   Mon Oct 28 14:02:08 2013 +0000

    Merge branch 'bug9349_server'

 doc/design.txt                     |   47 ++++-
 facilitator/Makefile               |    2 +
 facilitator/fac.py                 |  111 +++++++++++-
 facilitator/facilitator            |  343 ++++++++++++++++++++++++------------
 facilitator/facilitator-reg-daemon |   27 +--
 facilitator/facilitator-test       |  274 ++++++++++++++++++++++++++--
 facilitator/facilitator.cgi        |   38 ++--
 facilitator/init.d/facilitator     |    8 +-
 facilitator/relays                 |    4 +
 9 files changed, 678 insertions(+), 176 deletions(-)