commit 8ef1e83ed9695603d4a692ba80a185ebe3202154 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jan 6 12:47:41 2014 -0500 Revise proposal 185 to make DirCache flag unconditional Based on review by Karsten, who says: """I'm not sure why a) relays with a working DirPort shouldn't include "dir-cache 1" in their router descriptor and b) authorities shouldn't assign the "DirCache" flag to relays with a working DirPort that don't have a "dir-cache 1" line in their router descriptor. I understand that neither of the two actions are necessary to make the proposal work. But this could be a chance to get rid of the DirPort concept entirely and only rely on "dir-cache 1" and "DirCache" flags in the future.""" --- proposals/185-dir-without-dirport.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/proposals/185-dir-without-dirport.txt b/proposals/185-dir-without-dirport.txt index 62d5460..7302e75 100644 --- a/proposals/185-dir-without-dirport.txt +++ b/proposals/185-dir-without-dirport.txt @@ -30,11 +30,11 @@ Configuration: 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 that have a - working directory port advertise it as usual, and do not include a + Nodes that are running as a directory cache should set the entry + "dir-cache 1" in their router descriptors. If they do not have a + DirPort set, or do not have a working DirPort, they should give + their directory port as 0 in their router lines. (Nodes that have + a working directory port advertise it as usual, and also 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 @@ -43,6 +43,6 @@ Advertising cache status: Consensus: Authorities should assign a "DirCache" flag to all nodes running - as a directory cache that do not set a DirPort. + as a directory cache. This does not require a new version of the consensus algorithm.