[or-cvs] More dir-spec tweaks: specify whether concatenation happens...

[Nick Mathewson]

Update of /home/or/cvsroot/tor/doc
In directory moria:/tmp/cvs-serv16198/doc

Modified Files:
	dir-spec.txt 
Log Message:
More dir-spec tweaks: specify whether concatenation happens before or after compression (either) and make status URLs parallel server URLs better (or people will mock me later).

Index: dir-spec.txt
===================================================================
RCS file: /home/or/cvsroot/tor/doc/dir-spec.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dir-spec.txt	25 Aug 2005 20:04:12 -0000	1.10
+++ dir-spec.txt	26 Aug 2005 23:39:11 -0000	1.11
@@ -154,9 +154,13 @@
    The authoritative network-status published by a host should be available at:
       http://<hostname>/tor/status/authority.z
 
-   An authoritative network-status published by another host with fingerprint <F>
-   should be available at:
-      http://<hostname>/tor/status/<F>.z
+   An authoritative network-status published by another host with fingerprint
+   <F> should be available at:
+      http://<hostname>/tor/status/fp/<F>.z
+
+   An authoritative network-status published by other hosts with fingerprints
+   <F1>,<F2>,<F3> should be available at:
+      http://<hostname>/tor/status/fp/<F1>+<F2>+<F3>.z
 
    The most recent network-status documents from all known authoritative
    directories, concatenated, should be available at:
@@ -180,7 +184,11 @@
    For debugging, directories MAY expose non-compressed objects at URLs like
    the above, but without the final ".z".
 
-   [XXXX specify concatenation of several servers.]
+   Clients MUST handle compressed concatenated information in two forms:
+     - A concatenated list of zlib-compressed objects.
+     - A zlib-compressed concatenated list of objects.
+   Directory servers MAY generate either format: the former requires less
+   CPU, but the latter requires less bandwidth.
 
 4.1. Caching
 
@@ -191,6 +199,9 @@
    A concatenated list of all network-status documents should be available at:
       http://<hostname>/tor/status/all.z
 
+4.2. Compression
+
+
 5. Client operation
 
    Every OP or OR, including directory servers, acts as a client to the