commit ada3bdca87ff853a55e602beeffb4699ba9b2250 Merge: d8b73ec 5e0ed0a Author: Philipp Winter phw@torproject.org Date: Wed Jul 8 20:23:53 2020 +0000

Merge branch 'enhancement/34260' into 'develop'

Parse bridge blocking info from SQL database.

See merge request tpo/anti-censorship/bridgedb!7

CHANGELOG | 3 + bridgedb/Storage.py | 138 ++++++++++++++++++++++++++++++++++++- bridgedb/main.py | 26 +++++++ bridgedb/test/test_Storage.py | 157 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 321 insertions(+), 3 deletions(-)