[tor-commits] [tor/master] Bug 25870: Mention path restriction differences in manpage.

[nickm at torproject.org]

commit e716c92127f0da2fc5758c091a9e33857cd5e5d5
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue May 8 16:35:20 2018 +0000

    Bug 25870: Mention path restriction differences in manpage.
---
 doc/tor.1.txt | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 05a612d6a..2f74d567e 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1574,6 +1574,14 @@ The following options are useful only for clients (that is, if
     which means that nodes specified in ExcludeNodes will not be
     picked.
  +
+    When either this option or HSLayer3Nodes are set, the /16 subnet
+    and node family restrictions are removed for hidden service
+    circuits. Additionally, we allow the guard node to be present
+    as the Rend, HSDir, and IP node, and as the hop before it. This
+    is done to prevent the adversary from inferring information
+    about our guard, layer2, and layer3 node choices at later points
+    in the path.
+ +
     This option is meant to be managed by a Tor controller such as
     https://github.com/mikeperry-tor/vanguards that selects and
     updates this set of nodes for you. Hence it does not do load
@@ -1619,6 +1627,14 @@ The following options are useful only for clients (that is, if
     ExcludeNodes have higher priority than HSLayer3Nodes,
     which means that nodes specified in ExcludeNodes will not be
     picked.
+ +
+    When either this option or HSLayer2Nodes are set, the /16 subnet
+    and node family restrictions are removed for hidden service
+    circuits. Additionally, we allow the guard node to be present
+    as the Rend, HSDir, and IP node, and as the hop before it. This
+    is done to prevent the adversary from inferring information
+    about our guard, layer2, and layer3 node choices at later points
+    in the path.
   +
     This option is meant to be managed by a Tor controller such as
     https://github.com/mikeperry-tor/vanguards that selects and