[tor-commits] [bridgedb/master] Merge branch 'hotfix/9872-options-subcommands-relative-rundir' into develop

[isis at torproject.org]

commit cff49b44b2a318184cea82a1017cb82673e52d7d
Merge: 753d0de 99417d8
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Nov 19 02:12:30 2013 +0000

    Merge branch 'hotfix/9872-options-subcommands-relative-rundir' into develop

 lib/bridgedb/Main.py          |   28 +++----
 lib/bridgedb/parse/options.py |  163 ++++++++++++++++++++++++++++++++++++-----
 2 files changed, 158 insertions(+), 33 deletions(-)