commit 792cfd99bb3a4d5a116202e76532232aba6e6312 Author: Matthew Finkel Matthew.Finkel@gmail.com Date: Wed Aug 7 14:59:00 2013 +0000

Do not print "bridge" on the bridge line

Vidalia does not need/want/ask that the bridge line start with "bridge". Users expect to be able to copy and paste what they see on their screen and that it will work. Presently, this is not the case. #5851 states that we print "bridge" so that users can easily copy and paste the line directly into their torrc, however most users do not do this, so we should not add this string. TorButton will preserve this functionality.

This patch can be reverted if the functionality in TBB3.x is changed.

(cherry picked from commit dcb2a2515e360310a31887260278ea146db1c4f7) Signed-off-by: Isis Lovecruft isis@torproject.org

Edited-by: Isis Lovecruft isis@torproject.org Reason: Remove EOL whitespace from L193 and extra newline at L194. --- lib/bridgedb/Bridges.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index cf46b3b..98724d8 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -188,10 +188,9 @@ class Bridge: orport = portlist[pos % len(portlist)]

if includeFingerprint: - return "bridge %s:%d %s" % (ip, orport, self.fingerprint) + return "%s:%d %s" % (ip, orport, self.fingerprint) else: - return "bridge %s:%d" % (ip, orport) - + return "%s:%d" % (ip, orport)

def getAllConfigLines(self,includeFingerprint=False): """Generator. Iterate over all valid config lines for this bridge."""