commit f08a04058a93b2f0a44ba27b5a76ff05706a2089 Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 17 11:16:11 2012 -0500

Revise prop 185 based on comment from Karsten and Roger --- proposals/185-dir-without-dirport.txt | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/proposals/185-dir-without-dirport.txt b/proposals/185-dir-without-dirport.txt index 838a58a..62d5460 100644 --- a/proposals/185-dir-without-dirport.txt +++ b/proposals/185-dir-without-dirport.txt @@ -25,16 +25,19 @@ Configuration: if DirPort is set. If it is 1, then we act as a directory cache according to same rules as those used for nodes that set a DirPort. If it is "auto", then Tor decides whether to act as a - directory cache. + directory cache based on some future intelligent algorithm. "Auto" + should be the new default.

Advertising cache status:

Nodes which are running as a directory cache but which do not have a DirPort set, or which do not have a working DirPort, should set the entry "dir-cache 1" in their router descriptors and give their - directory port as 0 in their router lines. (Nodes which have a - working directory port advertise it as usual, and do not include - a "dir-cache" line. Implementations should accept and ignore + directory port as 0 in their router lines. (Nodes that have a + working directory port advertise it as usual, and do not include a + "dir-cache" line. Nodes that do not serve directory information + should set their directory port to 0, and not include any + dir-cache line. Implementations should accept and ignore dir-cache lines with values other than "dir-cache 1".)

Consensus: