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