diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-04-16 04:18:06 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-04-16 04:18:06 +0000 |
| commit | 108f1c255fff37188e7eebfc0f797b4301b04ac2 (patch) | |
| tree | 5930d201a204509979a6b101846f3718b003ca25 /doc/spec/dir-spec.txt | |
| parent | 5b220f65c8451620f2ee7a337af2829ecdb25288 (diff) | |
| download | tor-108f1c255fff37188e7eebfc0f797b4301b04ac2.tar.gz tor-108f1c255fff37188e7eebfc0f797b4301b04ac2.zip | |
r12386@catbus: nickm | 2007-04-15 23:55:34 -0400
Document multiplicity on some router elements better.
svn:r9964
Diffstat (limited to 'doc/spec/dir-spec.txt')
| -rw-r--r-- | doc/spec/dir-spec.txt | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/doc/spec/dir-spec.txt b/doc/spec/dir-spec.txt index be13e4ce8c..8a5d1e95e7 100644 --- a/doc/spec/dir-spec.txt +++ b/doc/spec/dir-spec.txt @@ -150,10 +150,16 @@ $Id$ Every router descriptor MUST start with a "router" Item; MUST end with a "router-signature" Item and an extra NL; and MUST contain exactly one instance of each of the following Items: "published" "onion-key" - "link-key" "signing-key" "bandwidth". Additionally, a router descriptor - MAY contain any number of "accept", "reject", "fingerprint", "uptime", and - "opt" Items. Other than "router" and "router-signature", the items may - appear in any order. + "link-key" "signing-key" "bandwidth". + + A router descriptor MAY have zero or one of each of the following Items, + but MUST NOT have more than one: "contact", "uptime", "fingerprint", + "hibernating", "read-history", "write-history", "eventdns", "platform", + "family". + + Additionally, a router descriptor MAY contain any number of "accept", + "reject", and "opt" Items. Other than "router" and "router-signature", + the items may appear in any order. The items' formats are as follows: "router" nickname address ORPort SocksPort DirPort |