[tor-commits] [flashproxy/master] Merge branch 'master' of https://git.torproject.org/flashproxy

commit 7e8ba657a30ab15383f03ec79c9f6c8ce56af1d8 Merge: af63106 823596e Author: Alexandre Allaire alexandre.allaire@mail.mcgill.ca Date: Sun Nov 11 19:09:20 2012 -0500

Merge branch 'master' of https://git.torproject.org/flashproxy

ChangeLog | 9 ++- Makefile | 2 +- README | 31 ++++----- doc/websocket-transport.txt | 4 +- experiments/exercise/exercise.sh | 2 +- flashproxy-client | 133 +++++++++++++++++++++++++++++++++----- flashproxy-reg-email | 17 +++++- torrc | 3 +- 8 files changed, 160 insertions(+), 41 deletions(-)