commit 6108ddf5003f5ab85de7d91e701231432fa148bc Merge: 8a73911 0361a00 Author: Ximin Luo infinity0@torproject.org Date: Mon Jul 7 09:33:11 2014 +0100

Merge branch 'bug9975'

Use argparse instead of getopt and factor out much duplicate code.

flashproxy-client | 310 +++++++++++++++++++++--------------------------- flashproxy-reg-appspot | 144 ++++------------------ flashproxy-reg-email | 195 +++++++----------------------- flashproxy-reg-http | 119 ++++--------------- flashproxy-reg-url | 111 +++-------------- flashproxy/keys.py | 66 ++++++++--- flashproxy/reg.py | 58 ++++++++- flashproxy/util.py | 38 ++++++ 8 files changed, 381 insertions(+), 660 deletions(-)