commit 41a353eccef256044f2c977fe83cca91fbe5f7f8 Merge: de32af6 8b72591 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 28 15:23:52 2012 -0400 Merge remote-tracking branch 'asn/bug5396' dir-spec.txt | 6 ++++++ proposals/180-pluggable-transport.txt | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --cc dir-spec.txt index fe2ed5d,b7cbefd..8403c52 --- a/dir-spec.txt +++ b/dir-spec.txt @@@ -911,10 -886,14 +911,16 @@@ [At most once.] List of mappings from ports to the number of opened exit streams - to that port, rounded up to the nearest multiple of 4. + to that port, rounded up to the nearest multiple of 4. Relays may + limit the number of listed ports and subsume any remaining opened + streams under port "other". + "transport" transportname address:port [arglist] NL + [Any number.] + + Signals that the router supports the 'transportname' pluggable + transport in IP address 'address' and TCP port 'port'. + "router-signature" NL Signature NL [At end, exactly once.]