[or-cvs] Make testcases run again; more sanity checking to descripto...

[Nick Mathewson]

Update of /home/or/cvsroot/doc
In directory moria.mit.edu:/tmp/cvs-serv9427/doc

Modified Files:
	TODO tor-spec.txt 
Log Message:
Make testcases run again; more sanity checking to descriptor generation.

Index: TODO
===================================================================
RCS file: /home/or/cvsroot/doc/TODO,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- TODO	1 Oct 2003 03:35:31 -0000	1.24
+++ TODO	1 Oct 2003 22:31:12 -0000	1.25
@@ -44,7 +44,6 @@
 NICK    - instruments ORs to report stats
           - average cell fullness
           - average bandwidth used
-          - others?
         . integrate rep_ok functions, see what breaks
 ARMA    - configure log files. separate log file, separate severities.
 ARMA    - what assumptions break if we fclose(0) when we daemonize?

Index: tor-spec.txt
===================================================================
RCS file: /home/or/cvsroot/doc/tor-spec.txt,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- tor-spec.txt	1 Oct 2003 01:56:46 -0000	1.33
+++ tor-spec.txt	1 Oct 2003 22:31:12 -0000	1.34
@@ -441,7 +441,7 @@
 (Unless otherwise noted, tokens on the same line are space-separated.)
 
 Router ::= Router-Line  Date-Line Onion-Key Link-Key Signing-Key  Exit-Policy Router-Signature NL
-Router-Line ::= "router" address ORPort APPort DirPort bandwidth NL
+Router-Line ::= "router" nickname address ORPort APPort DirPort bandwidth NL
 Date-Line ::= "published" YYYY-MM-DD HH:MM:SS NL
 Onion-key ::= "onion-key"  NL  a public key in PEM format   NL
 Link-key ::= "link-key"  NL  a public key in PEM format  NL
@@ -457,9 +457,11 @@
 DirPort ::= where the router listens for directory download requests
 bandwidth ::= maximum bandwidth, in bytes/s
 
+nickname ::= between 1 and 32 alphanumeric characters.  case-insensitive.
 
 Example:
-router moria.mit.edu 9001 9021 9031 100000
+router moria1 moria.mit.edu 9001 9021 9031 100000
+published 2003-09-24 19:36:05
 -----BEGIN RSA PUBLIC KEY-----
 MIGJAoGBAMBBuk1sYxEg5jLAJy86U3GGJ7EGMSV7yoA6mmcsEVU3pwTUrpbpCmwS
 7BvovoY3z4zk63NZVBErgKQUDkn3pp8n83xZgEf4GI27gdWIIwaBjEimuJlEY+7K