[tor-commits] [bridgedb/master] Merge branch 'fix/11196-use-leekspin_r1' into develop

[isis at torproject.org]

commit 715ab6a93636f7616036adcd72cf168ede752b42
Merge: 97e261d c9ba8cf
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Mar 25 02:28:31 2014 +0000

    Merge branch 'fix/11196-use-leekspin_r1' into develop

 .travis.yml                        |    7 +-
 lib/bridgedb/runner.py             |    2 +-
 lib/bridgedb/test/test_bridgedb.py |   12 +-
 scripts/gen_bridge_descriptors     |  870 ------------------------------------
 setup.py                           |    8 +-
 5 files changed, 16 insertions(+), 883 deletions(-)