[tor-commits] [tor/master] Fix TestingDirAuthVoteHSDir docs: HSDir flag needs DirPort

[nickm at torproject.org]

commit 0cb82013cceba8ade6ae83e983b609df3a848f72
Author: teor <teor2345 at gmail.com>
Date:   Wed May 6 23:37:38 2015 +1000

    Fix TestingDirAuthVoteHSDir docs: HSDir flag needs DirPort
    
    Fix an error in the manual page and comments for
    TestingDirAuthVoteHSDir, which suggested that a
    HSDir required "ORPort connectivity". While this is true,
    it is in no way unique to the HSDir flag. Of all the flags,
    only HSDirs need a DirPort configured in order for the
    authorities to assign that particular flag.
    
    Fixed as part of 14882. Patch by "teor".
    Bugfix on 0.2.6.3 (f9d57473e1ff on 10 January 2015).
---
 doc/tor.1.txt |    2 +-
 src/or/or.h   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 3a54957..bc706e7 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2347,7 +2347,7 @@ The following options are used for running a testing Tor network.
 [[TestingDirAuthVoteHSDir]] **TestingDirAuthVoteHSDir** __node__,__node__,__...__::
     A list of identity fingerprints and country codes and
     address patterns of nodes to vote HSDir for regardless of their
-    uptime and ORPort connectivity. See the **ExcludeNodes** option for more
+    uptime and DirPort. See the **ExcludeNodes** option for more
     information on how to specify nodes.
  +
     In order for this option to have any effect, **TestingTorNetwork**
diff --git a/src/or/or.h b/src/or/or.h
index f6aee13..4a31351 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4100,7 +4100,7 @@ typedef struct {
   routerset_t *TestingDirAuthVoteGuard;
 
   /** Relays in a testing network which should be voted HSDir
-   * regardless of uptime and ORPort connectivity.
+   * regardless of uptime and DirPort.
    * Respects VoteOnHidServDirectoriesV2. */
   routerset_t *TestingDirAuthVoteHSDir;