[tor-commits] [torspec/master] make explicit how to distinguish old bridge lines

[arma at torproject.org]

commit e65b0219700ab09819aebeab6034df9cbb3b3591
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Apr 11 19:27:43 2011 -0400

    make explicit how to distinguish old bridge lines
---
 proposals/180-pluggable-transport.txt |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt
index daa81bf..5e9e5b1 100644
--- a/proposals/180-pluggable-transport.txt
+++ b/proposals/180-pluggable-transport.txt
@@ -159,6 +159,15 @@ Specifications: Client behavior
   The "id-fingerprint" field is always provided in a field named
   "keyid", if it was given.  Method names must be C identifiers.
 
+  For reference, the old bridge format was
+    bridge address[:port] [id-fingerprint]
+  where port defaults to 443 and the id-fingerprint is optional. The
+  new format can be distinguished from the old one by checking if the
+  first argument has any non-C-identifier characters. (Looking for a
+  period should be a simple way.) Also, while the id-fingerprint could
+  optionally include whitespace in the old format, whitespace in the
+  id-fingerprint is not permitted in the new format.
+
   Example: if the bridge line is "bridge trebuchet www.example.com:3333
      rocks=20 height=5.6m" AND if the Tor client knows that the
      'trebuchet' method is provided by a SOCKS5 proxy on