[tor-commits] [bridgedb/master] Merge branch 'fix/16616-hsdir-flag' into develop

[isis at torproject.org]

commit 5e97d681d201c1d078aa0dbf23475841f1f0eb9d
Merge: 40334fa 5f3910b
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Jul 21 04:46:53 2015 +0000

    Merge branch 'fix/16616-hsdir-flag' into develop

 test/test_bridges.py           |   19 +++++++++++++++++++
 test/test_parse_descriptors.py |   24 ++++++++++++++++++++++++
 2 files changed, 43 insertions(+)