[tor-commits] [bridgedb/develop] Merge branch 'hotfix/9380-duplicate-extrainfo-error' into develop

[isis at torproject.org]

commit 8b0cabfaeefaef40af03ffa4ecce210702280beb
Merge: 5b401e3 ed27df5
Author: Isis Lovecruft <isis at torproject.org>
Date:   Sat Mar 21 05:06:54 2015 +0000

    Merge branch 'hotfix/9380-duplicate-extrainfo-error' into develop

 lib/bridgedb/parse/descriptors.py           |   12 ++++++++----
 lib/bridgedb/test/test_parse_descriptors.py |    9 +++++----
 2 files changed, 13 insertions(+), 8 deletions(-)