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

[dcf at torproject.org]

commit e00477ac57ef6403a1a7ec06166f957031cb4783
Merge: 6765aa3 878dc70
Author: Alexandre Allaire <alexandre.allaire at mail.mcgill.ca>
Date:   Thu Nov 29 15:48:29 2012 +0000

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

 ChangeLog           |    5 +++++
 proxy/flashproxy.js |   15 +++++++++++++++
 2 files changed, 20 insertions(+), 0 deletions(-)