[tor-commits] [flashproxy/master] Merge branch 'opt-in' of https://github.com/aallai/flashproxy into opt-in

[dcf at torproject.org]

commit d3dd285f70bb727db8d26fef4510bf4a2dfe170c
Merge: 545a690 9ab1414
Author: David Fifield <david at bamsoftware.com>
Date:   Fri Dec 28 06:08:09 2012 -0800

    Merge branch 'opt-in' of https://github.com/aallai/flashproxy into opt-in

 proxy/flashproxy-test.js |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)