commit bf9f61d010b983d8b8d2b2ffb6ee5fffb707d4e1 Merge: 3890690 7530035 Author: Isis Lovecruft <isis@torproject.org> Date: Fri Dec 20 06:05:39 2013 +0000 Merge branch 'hotfix/9462B-netstatus-returns-None' into develop lib/bridgedb/test/test_parse_networkstatus.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)