Merge branch 'enhancement/34154' into develop

2 files changed, 11 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 5ac9e0b..80d3afa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+    * FIXES https://bugs.torproject.org/34154
+    Add new fields to the SQLite table BlockedBridges in preparation for taking
+    into account OONI's bridge measurement results.
+
     * FIXES https://bugs.torproject.org/31528
     BridgeDB's UI uses a bunch of obscure "chatspeak" references in its UI.  One
     example is that it responds with "Uh oh, spaghettios!" if there are
diff --git a/bridgedb/Storage.py b/bridgedb/Storage.py
index d725fa3..0fe8851 100644
--- a/bridgedb/Storage.py
+++ b/bridgedb/Storage.py
@@ -70,7 +70,13 @@ SCHEMA2_SCRIPT = """
  CREATE TABLE BlockedBridges (
      id INTEGER PRIMARY KEY NOT NULL,
      hex_key,
-     blocking_country
+     bridge_type,
+     address,
+     port,
+     blocking_country,
+     blocking_asn,
+     measured_by,
+     last_measured
  );
 
  CREATE INDEX BlockedBridgesBlockingCountry on BlockedBridges(hex_key);