commit 2cf7c7301474574a368b69b0f88b2b0257012b16 Merge: 47b6a88 2fcc3b5 Author: Isis Lovecruft isis@torproject.org Date: Fri Dec 20 05:32:02 2013 +0000

Merge branch 'hotfix/9462B-netstatus-returns-None' into develop

lib/bridgedb/Bridges.py | 11 +++++++---- lib/bridgedb/parse/networkstatus.py | 13 ++++++------- 2 files changed, 13 insertions(+), 11 deletions(-)