diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-05-10 11:12:24 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-05-10 11:12:24 -0400 |
commit | d76cffda601eed40d6a81eadb1240d98ee1e70a2 (patch) | |
tree | a153bd842af1f4f8741490fe71245bf99f913d84 /doc | |
parent | 8266d193a608445b0d8675a83733870a2733e2b9 (diff) | |
parent | 9fc1346df2e1402a6895bdf826f8757da7e49608 (diff) | |
download | tor-d76cffda601eed40d6a81eadb1240d98ee1e70a2.tar.gz tor-d76cffda601eed40d6a81eadb1240d98ee1e70a2.zip |
Merge remote-tracking branch 'public/my-family-list-fix-4498'
Diffstat (limited to 'doc')
-rw-r--r-- | doc/tor.1.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 1a0ce8b425..9c59ae8b41 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1732,14 +1732,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. |