[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 3817ac07746bfa0631a09b6a46112f3ac560d3d2
Merge: 53b6d4e fd62b12
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Dec 11 04:02:49 2013 +0000

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

 lib/bridgedb/parse/addr.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)