[tor-commits] [chutney/master] Restore test for bridge presence in networkstatus.

[nickm at torproject.org]

commit 0767932c890b167088d6697f245cdaad58571c3f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 20 11:58:59 2020 -0400

    Restore test for bridge presence in networkstatus.
    
    Without this check, bridges+hs-v23 seems to be failing.  If this
    works with all our supported versions, I'll figure out what to do
    with the mentioned issues (chutney#33851 and tor#33852, and also see
    tor#33407).
---
 lib/chutney/TorNet.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index c832b9f..e3aca65 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -1415,13 +1415,9 @@ class LocalNodeController(NodeController):
             # bridge descs are stored with relay descs
             paths = { 'desc': desc,
                       'desc_new': desc_new }
-            # Temporarily disabled due to bug #33582. We will reactivate these
-            # checks in #33581. There's a race condition between bridges
-            # bootstrapping, and trying to publish their descriptors too early
             if to_bridge_auth:
-                paths = None
-            #   br_status = Path(datadir, "networkstatus-bridges")
-            #   paths['br_status'] = br_status
+                br_status = Path(datadir, "networkstatus-bridges")
+                paths['br_status'] = br_status
         else:
             # We're looking for bridges, but other nodes don't use bridges
             paths = None