[tor-commits] [chutney/master] Clean up a duplicate comment

[nickm at torproject.org]

commit 6ad567d7d2f3c75e4255d9a5a4a330a5c88be60b
Author: teor <teor at riseup.net>
Date:   Mon May 18 14:29:45 2020 +1000

    Clean up a duplicate comment
---
 lib/chutney/TorNet.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 5d28763..15ca031 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -1332,16 +1332,13 @@ class LocalNodeController(NodeController):
             # bridge descs are stored with relay descs
             paths = { 'desc': desc,
                       'desc_new': desc_new }
-            # Temporarily disabled due to bug #33407, will restore in #33581
-            # There's a race condition between bridges bootstrapping, and them
-            # trying to publish their descriptors too early
+            # 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
-            # Disabled due to bug #33407: chutney bridge authorities don't publish
-            # bridge descriptors in the bridge networkstatus file
-            #if to_bridge_auth:
-            #    br_status = os.path.join(datadir, "networkstatus-bridges")
-            #    paths['br_status'] = br_status
+            #   br_status = os.path.join(datadir, "networkstatus-bridges")
+            #   paths['br_status'] = br_status
         else:
             # We're looking for bridges, but other nodes don't use bridges
             paths = None