[tor-commits] [bridgedb/master] Merge branch 'hotfix/9462B-netstatus-returns-None' into develop

[isis at torproject.org]

commit 21d03615a3b2401ca04e981227e7d7605d3ca995
Merge: bf9f61d e6af3ad
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Dec 20 06:49:26 2013 +0000

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

 lib/bridgedb/test/test_parse_networkstatus.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)