diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-28 15:23:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-28 15:23:52 -0400 |
| commit | 41a353eccef256044f2c977fe83cca91fbe5f7f8 (patch) | |
| tree | c6bf159ae2450e7b9297daadf99991c984571fb9 /proposals/180-pluggable-transport.txt | |
| parent | de32af6f314a28e68b60b5c6994b83eb627587d7 (diff) | |
| parent | 8b725914cac69c5a4d208e0835a1404e40e41970 (diff) | |
| download | torspec-41a353eccef256044f2c977fe83cca91fbe5f7f8.tar.gz torspec-41a353eccef256044f2c977fe83cca91fbe5f7f8.zip | |
Merge remote-tracking branch 'asn/bug5396'
Diffstat (limited to 'proposals/180-pluggable-transport.txt')
| -rw-r--r-- | proposals/180-pluggable-transport.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index c548675..cc279c2 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -481,7 +481,7 @@ Advertising bridge methods Bridges put the 'method' lines in their extra-info documents. - method SP <methodname> SP <address:port> [SP arglist] NL + transport SP <transportname> SP <address:port> [SP arglist] NL The address:port are as returned from an SMETHOD line (unless they are replaced by the FORWARD: directive). The arglist is a K=V,... list as @@ -490,7 +490,7 @@ Advertising bridge methods If the SMETHOD line includes a DECLARE: part, the router descriptor gets a new line: - method-info SP <methodname> [SP arglist] NL + transport-info SP <transportname> [SP arglist] NL Bridge authority behavior |