[tor-commits] [bridgedb/master] Merge branch 'fix/16330-eid-sds-2-fields' into develop

[isis at torproject.org]

commit 2b31c86209c6c43cda90dec910a0f262f170fa1c
Merge: 0b62526 42f19f5
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Jun 16 04:52:53 2015 +0000

    Merge branch 'fix/16330-eid-sds-2-fields' into develop

 .travis.requirements.txt                    |    2 +-
 lib/bridgedb/test/test_parse_descriptors.py |  121 +++++++++++++++++++++++++++
 requirements.txt                            |    2 +-
 setup.py                                    |    4 +-
 4 files changed, 126 insertions(+), 3 deletions(-)