[tor-commits] [flashproxy/master] Commiting merge of make_exe branch from https://git.torproject.org/user/dcf/flashproxy.git

[dcf at torproject.org]

commit 34165e549824e5e6ebbea8b687d86615c3bf4c32
Merge: 45a9555 f542514
Author: Alexandre Allaire <alexandre.allaire at mail.mcgill.ca>
Date:   Sat Nov 24 19:49:47 2012 -0500

    Commiting merge of make_exe branch from https://git.torproject.org/user/dcf/flashproxy.git

 LICENSE                          |  219 +++++++++++
 Makefile                         |    8 +-
 doc/LICENSE.GPL                  |  280 ++++++++++++++
 doc/LICENSE.PYTHON               |  773 ++++++++++++++++++++++++++++++++++++++
 doc/windows-deployment-howto.txt |   48 ++-
 flashproxy-client                |    5 +-
 6 files changed, 1321 insertions(+), 12 deletions(-)