commit 23b7eb2efb74e2e31e0aea07ab7ccd4c27e8f11f Merge: b1ca816 933c0de Author: Isis Lovecruft isis@torproject.org Date: Tue Nov 19 03:09:28 2013 +0000

Merge branch 'hotfix/9872-return-status-codes' into develop

lib/bridgedb/Main.py | 11 ++++++++--- lib/bridgedb/runner.py | 7 +++++-- 2 files changed, 13 insertions(+), 5 deletions(-)