[tor-commits] [bridgedb/develop] Merge branch 'fix/3015-remove-buckets' into develop

[isis at torproject.org]

commit e3a2ea593dcc6614b865572d9fc1d3b333b5770d
Merge: 16e7a2d f4d5591
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Nov 28 21:22:24 2017 +0000

    Merge branch 'fix/3015-remove-buckets' into develop

 README.rst                            |  23 +--
 bridgedb.conf                         |   6 -
 bridgedb/Bridges.py                   |  18 +--
 bridgedb/Bucket.py                    | 288 ----------------------------------
 bridgedb/main.py                      |  51 +++---
 bridgedb/parse/options.py             |  29 ++--
 bridgedb/runner.py                    |  14 --
 bridgedb/test/test_Bucket.py          |  63 --------
 bridgedb/test/test_bridgedb_script.py |  19 ---
 bridgedb/test/test_main.py            |  26 +--
 doc/sphinx/source/bridgedb.Bucket.rst |   8 -
 doc/sphinx/source/bridgedb.rst        |   1 -
 doc/sphinx/source/conf.py             |   1 -
 13 files changed, 41 insertions(+), 506 deletions(-)