diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-03-05 10:52:59 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-03-05 10:52:59 -0500 |
| commit | 1da0b05a5cace6ed05244e3e2c12e4babd4641fa (patch) | |
| tree | fa38b1b110bb2539af69279d487ba9ceb77228da | |
| parent | a63b4148229ae8ce46494fd6a0f99149c231605c (diff) | |
| parent | ef991b04e26eb4db445f9e5c1d82b1dea3f4007f (diff) | |
| download | tor-1da0b05a5cace6ed05244e3e2c12e4babd4641fa.tar.gz tor-1da0b05a5cace6ed05244e3e2c12e4babd4641fa.zip | |
Merge commit 'ef991b04e26eb4db'
| -rw-r--r-- | changes/doc33417 | 3 | ||||
| -rw-r--r-- | doc/tor.1.txt | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/changes/doc33417 b/changes/doc33417 new file mode 100644 index 0000000000..0fc868fc65 --- /dev/null +++ b/changes/doc33417 @@ -0,0 +1,3 @@ + o Documentation (manpage): + - Refrain from mentioning nicknames in manpage section for MyFamily torrc + option. Resolves issue 33417. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 9f428cb797..3b70bfca5d 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2363,14 +2363,11 @@ is non-zero): list itself, but it won't hurt if it does.) 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. + - + If you run more than one relay, the MyFamily option on each relay **must** list all other relays, as described above. + + Note: do not use MyFamily when configuring your Tor instance as a - brigde. + bridge. [[Nickname]] **Nickname** __name__:: Set the server's nickname to \'name'. Nicknames must be between 1 and 19 |