[tor-commits] [bridgedb/master] Merge branch 'fix/10811-add-SIGUSR1-handler' into develop

[isis at torproject.org]

commit 5a371d2f242509909bc9c335ac357f84a9b249c1
Merge: 44be20d 9b5c320
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Feb 5 22:36:46 2014 +0000

    Merge branch 'fix/10811-add-SIGUSR1-handler' into develop

 lib/bridgedb/Bridges.py       |    4 ++--
 lib/bridgedb/Bucket.py        |    1 +
 lib/bridgedb/Main.py          |   21 ++++++++++++++++-----
 lib/bridgedb/parse/options.py |   28 +++++++++++++++++++++++++++-
 4 files changed, 46 insertions(+), 8 deletions(-)