commit 545a690753691cd49da61c74b4e5078f5acb554c Merge: 6d6505a c71ef52 Author: David Fifield david@bamsoftware.com Date: Tue Dec 25 13:41:44 2012 -0800

Merge branch 'master' into opt-in

ChangeLog | 20 ++++++ Makefile | 4 +- doc/bundle-gnulinux.txt | 129 ++++++++++++++++++++++++++++++++++++++ doc/bundle-macosx.txt | 93 +++++++++++++++++++++++++++ doc/bundle-windows.txt | 66 +++++++++++++++++++ doc/facilitator-howto.txt | 4 +- doc/flashproxy-client.1 | 14 ++++- doc/flashproxy-client.1.txt | 6 ++ doc/flashproxy-reg-email.1 | 8 ++- doc/flashproxy-reg-email.1.txt | 6 ++- doc/flashproxy-reg-http.1 | 14 ++++- doc/flashproxy-reg-http.1.txt | 6 ++ experiments/facilitator-graph.py | 79 +++++------------------ facilitator/facilitator | 100 ++++++++++++++++++++++++----- facilitator/facilitator-test | 32 +++++++++ facilitator/facilitator.cgi | 10 ++-- flashproxy-client | 30 +++++++-- flashproxy-client.spec | 2 +- flashproxy-reg-http | 17 +++++- init.d/websockify | 2 +- proxy/flashproxy.js | 10 +++- torrc | 5 +- 22 files changed, 551 insertions(+), 106 deletions(-)