aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDaniel Pinto <danielpinto52@gmail.com>2017-04-14 13:04:37 +0100
committerDaniel Pinto <danielpinto52@gmail.com>2017-04-14 13:04:37 +0100
commitfa04fe1674bfc786785c88fb3f49e8b8a8e0b9e5 (patch)
tree7204c87cd354281512e00aaa907bb1cdfedf6453 /doc
parentb081a7ed21ae729f6e195715e130edaca3e0b7fe (diff)
downloadtor-fa04fe1674bfc786785c88fb3f49e8b8a8e0b9e5.tar.gz
tor-fa04fe1674bfc786785c88fb3f49e8b8a8e0b9e5.zip
MyFamily config string is now a list. #4998
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt13
1 files changed, 7 insertions, 6 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 568d037d98..916824579c 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1813,14 +1813,15 @@ is non-zero):
If we have more onionskins queued for processing than we can process in
this amount of time, reject new ones. (Default: 1750 msec)
-[[MyFamily]] **MyFamily** __node__,__node__,__...__::
+[[MyFamily]] **MyFamily** __node__::
Declare that this Tor server is controlled or administered by a group or
organization identical or similar to that of the other servers, defined by
- their identity fingerprints. When two servers both declare
- that they are in the same \'family', Tor clients will not use them in the
- same circuit. (Each server only needs to list the other servers in its
- family; it doesn't need to list itself, but it won't hurt.) Do not list
- any bridge relay as it would compromise its concealment. +
+ their identity fingerprints. This option can be repeated many times, for
+ multiple families. When two servers both declare that they are in the
+ same \'family', Tor clients will not use them in the same circuit. (Each
+ server only needs to list the other servers in its family; it doesn't need to
+ list itself, but it won't hurt.) Do not list any bridge relay as it would
+ compromise its concealment. +
+
When listing a node, it's better to list it by fingerprint than by
nickname: fingerprints are more reliable.