Merge branch 'enhancement/34260' into 'develop'
commitada3bdca87ff853a55e602beeffb4699ba9b2250
authorPhilipp Winter <phw@torproject.org>
Wed, 8 Jul 2020 20:23:53 +0000 (8 20:23 +0000)
committerPhilipp Winter <phw@torproject.org>
Wed, 8 Jul 2020 20:23:53 +0000 (8 20:23 +0000)
treedc4986e53ae477d9496cef2f37c4c00b8dc3f6af
parentd8b73ecd65664bf60f61a72b3fb4e233663a6bee
parent5e0ed0af43e876c3305ab75c782ac67b51ea1eb9
Merge branch 'enhancement/34260' into 'develop'

Parse bridge blocking info from SQL database.

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