[tor-bugs] #5851 [BridgeDB]: Improve bridges.torproject.org and bridges.html.en for blind users

Tor Bug Tracker & Wiki torproject-admin at torproject.org
Wed May 23 22:27:09 UTC 2012


#5851: Improve bridges.torproject.org and bridges.html.en for blind users
-------------------------+--------------------------------------------------
 Reporter:  runa         |          Owner:     
     Type:  enhancement  |         Status:  new
 Priority:  normal       |      Milestone:     
Component:  BridgeDB     |        Version:     
 Keywords:               |         Parent:     
   Points:               |   Actualpoints:     
-------------------------+--------------------------------------------------

Comment(by aagbsn):

 I can remove the substring 'bridge' easily. I don't recall any good reason
 why this shouldn't be done.

 Note that this would change the entries written to bridgedb's logfile.

 {{{

 diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py
 index 358e362..736cdbd 100644
 --- a/lib/bridgedb/Bridges.py
 +++ b/lib/bridgedb/Bridges.py
 @@ -138,9 +138,9 @@ class Bridge:
      def getConfigLine(self,includeFingerprint=False):
          """Return a line describing this bridge for inclusion in a
 torrc."""
          if includeFingerprint:
 -            return "bridge %s:%d %s" % (self.ip, self.orport,
 self.fingerprint)
 +            return "%s:%d %s" % (self.ip, self.orport, self.fingerprint)
          else:
 -            return "bridge %s:%d" % (self.ip, self.orport)
 +            return "%s:%d" % (self.ip, self.orport)

      def assertOK(self):
          assert is_valid_ip(self.ip)
 diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py
 index 8ef6fc0..b35b4be 100644
 --- a/lib/bridgedb/Main.py
 +++ b/lib/bridgedb/Main.py
 @@ -329,6 +329,7 @@ def startup(cfg):
              logging.info("Here are all known bridges in the category
 section:")
              for r in ipDistributor.categoryRings:
                  for name, b in r.bridges.items():
 +                    #XXX #5841: removal of 'bridge' substring changes the
 log output
                      logging.info("%s" % b.getConfigLine(True))

          # Dump bridge pool assignments to disk.
 }}}

-- 
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/5851#comment:1>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online


More information about the tor-bugs mailing list