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

[dcf at torproject.org]

commit af631063ecf97e82a290810b527dfeef412829f3
Merge: 9cc3c1a a6e046c
Author: Alexandre Allaire <alexandre.allaire at mail.mcgill.ca>
Date:   Wed Nov 7 21:00:18 2012 -0500

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

 ChangeLog            |   10 ++++++++++
 flashproxy-reg-email |   10 +++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)