commit ffad9203dfda7848d780bf258dd141a2ea42e16f Author: Isis Lovecruft isis@torproject.org Date: Sat Jan 11 22:46:36 2014 +0000
Remove `keyid=` from torrc Bridge lines in pt-spec.txt.
* FIXES #10614 --- pt-spec.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pt-spec.txt b/pt-spec.txt index c4d9f8d..a8f6174 100644 --- a/pt-spec.txt +++ b/pt-spec.txt @@ -24,7 +24,7 @@ Specifications: Client behavior to use to connect to a bridge.
The new format is: - Bridge method address:port [[keyid=]id-fingerprint] [k=v] [k=v] [k=v] + Bridge method address:port [id-fingerprint] [k=v] [k=v] [k=v]
To connect to such a bridge, the Tor program needs to know which SOCKS proxy will support the transport called "method". It @@ -55,7 +55,7 @@ Specifications: Client behavior id-fingerprint is not permitted in the new format.
Example: if the bridge line is "bridge trebuchet www.example.com:3333 - keyid=09F911029D74E35BD84156C5635688C009F909F9 rocks=20 height=5.6m" + 09F911029D74E35BD84156C5635688C009F909F9 rocks=20 height=5.6m" AND if the Tor client knows that the 'trebuchet' method is supported, the client should connect to the proxy that provides the 'trebuchet' method, ask it to connect to www.example.com, and provide the string