sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.3.2' into release-0.3.2

This commit is contained in:
Nick Mathewson 2018-01-11 20:00:43 -05:00
parent 01d6e23f76 db5aa54a42
commit dbea64aab6
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug24526 Normal file
View File

@ -0,0 +1,4 @@
o Documentation:
- Document that operators who run more than one relay or bridge are
expected to set MyFamily and ContactInfo correctly. Closes ticket
24526.

12
doc/tor.1.txt
View File

@ -1703,7 +1703,12 @@ is non-zero):
descriptors containing these lines and that Google indexes them, so descriptors containing these lines and that Google indexes them, so
spammers might also collect them. You may want to obscure the fact spammers might also collect them. You may want to obscure the fact
that it's an email address and/or generate a new address for this that it's an email address and/or generate a new address for this
purpose. purpose. +
+
ContactInfo **must** be set to a working address if you run more than one
relay or bridge. (Really, everybody running a relay or bridge should set
it.)
[[ExitRelay]] **ExitRelay** **0**|**1**|**auto**:: [[ExitRelay]] **ExitRelay** **0**|**1**|**auto**::
Tells Tor whether to run as an exit relay. If Tor is running as a Tells Tor whether to run as an exit relay. If Tor is running as a
@ -1831,7 +1836,10 @@ is non-zero):
compromise its concealment. + compromise its concealment. +
+ +
When listing a node, it's better to list it by fingerprint than by When listing a node, it's better to list it by fingerprint than by
nickname: fingerprints are more reliable. 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.
[[Nickname]] **Nickname** __name__:: [[Nickname]] **Nickname** __name__::
Set the server's nickname to \'name'. Nicknames must be between 1 and 19 Set the server's nickname to \'name'. Nicknames must be between 1 and 19

6
src/config/torrc.minimal.in-staging
View File

@ -132,6 +132,9 @@
## spammers might also collect them. You may want to obscure the fact that ## spammers might also collect them. You may want to obscure the fact that
## it's an email address and/or generate a new address for this purpose. ## it's an email address and/or generate a new address for this purpose.
## Notice that "<" and ">" are recommended. ## Notice that "<" and ">" are recommended.
##
## If you are running multiple relays, you MUST set this option.
##
#ContactInfo Random Person <nobody AT example dot com> #ContactInfo Random Person <nobody AT example dot com>
## You might also include your PGP or GPG fingerprint if you have one. ## You might also include your PGP or GPG fingerprint if you have one.
## Use the full fingerprint, not just a (short) KeyID: KeyIDs are easy ## Use the full fingerprint, not just a (short) KeyID: KeyIDs are easy
@ -161,6 +164,9 @@
## See https://www.torproject.org/docs/faq#MultipleRelays ## See https://www.torproject.org/docs/faq#MultipleRelays
## However, you should never include a bridge's fingerprint here, as it would ## However, you should never include a bridge's fingerprint here, as it would
## break its concealability and potentially reveal its IP/TCP address. ## break its concealability and potentially reveal its IP/TCP address.
##
## If you are running multiple relays, you MUST set this option.
##
#MyFamily $keyid,$keyid,... #MyFamily $keyid,$keyid,...
## Uncomment this if you want your relay to allow IPv6 exit traffic. ## Uncomment this if you want your relay to allow IPv6 exit traffic.

6
src/config/torrc.sample.in
View File

@ -136,6 +136,9 @@
## descriptors containing these lines and that Google indexes them, so ## descriptors containing these lines and that Google indexes them, so
## spammers might also collect them. You may want to obscure the fact that ## spammers might also collect them. You may want to obscure the fact that
## it's an email address and/or generate a new address for this purpose. ## it's an email address and/or generate a new address for this purpose.
##
## If you are running multiple relays, you MUST set this option.
##
#ContactInfo Random Person <nobody AT example dot com> #ContactInfo Random Person <nobody AT example dot com>
## You might also include your PGP or GPG fingerprint if you have one: ## You might also include your PGP or GPG fingerprint if you have one:
#ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com> #ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com>
@ -162,6 +165,9 @@
## https://www.torproject.org/docs/faq#MultipleRelays ## https://www.torproject.org/docs/faq#MultipleRelays
## However, you should never include a bridge's fingerprint here, as it would ## However, you should never include a bridge's fingerprint here, as it would
## break its concealability and potentially reveal its IP/TCP address. ## break its concealability and potentially reveal its IP/TCP address.
##
## If you are running multiple relays, you MUST set this option.
##
#MyFamily $keyid,$keyid,... #MyFamily $keyid,$keyid,...
## Uncomment this if you do *not* want your relay to allow any exit traffic. ## Uncomment this if you do *not* want your relay to allow any exit traffic.