[tor-commits] [bridgedb/master] Merge branch 'fix/10333-index-by-0L_r2' into fix/9462-refactor-netstatus-parsers_r9462C_r2

[isis at torproject.org]

commit 8581578400200fc0efba1095436ed0a3ce98e145
Merge: 3817ac0 63b5a6e
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Dec 11 04:38:21 2013 +0000

    Merge branch 'fix/10333-index-by-0L_r2' into fix/9462-refactor-netstatus-parsers_r9462C_r2

 lib/bridgedb/test/test_parse_addr.py |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)