[tor-commits] [torspec/master] Tor has never supported versions in the hidden-service-dir descriptor line

[nickm at torproject.org]

commit 43c2f78f0238e2cccd9f58d630f6f441f4504feb
Author: teor <teor2345 at gmail.com>
Date:   Fri Mar 30 07:16:59 2018 +1100

    Tor has never supported versions in the hidden-service-dir descriptor line
    
    Instead, we use the HSDir "proto" versions, or default to version 2.
    
    Closes 25284.
---
 dir-spec.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index bc17913..e27d89a 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -711,14 +711,14 @@
        [Versions before 0.2.7.2-alpha did not include a SHA256 digest.]
        [Versions before 0.2.0.1-alpha don't recognize this field at all.]
 
-   "hidden-service-dir" *(SP VersionNum) NL
+   "hidden-service-dir" NL
 
        [At most once.]
 
        Present only if this router stores and serves hidden service
-       descriptors. If any VersionNum(s) are specified, this router
-       supports those descriptor versions. If none are specified, it
-       defaults to version 2 descriptors.
+       descriptors. This router supports the descriptor versions declared
+       in the HSDir "proto" entry. If there is no "proto" entry, this
+       router supports version 2 descriptors.
 
    "protocols" SP "Link" SP LINK-VERSION-LIST SP "Circuit" SP
           CIRCUIT-VERSION-LIST NL