aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorKarsten Loesing <karsten.loesing@gmx.net>2013-10-09 12:01:45 +0200
committerNick Mathewson <nickm@torproject.org>2013-10-09 09:43:18 -0400
commit66a04a6ac334775dc396025e0c15fa49eca138a7 (patch)
treea650154b133a3af19d50682d08dc3ece2f4428a1 /doc
parentb8abadedd3cb7ac3d140becf23d0a624e6405749 (diff)
downloadtor-66a04a6ac334775dc396025e0c15fa49eca138a7.tar
tor-66a04a6ac334775dc396025e0c15fa49eca138a7.tar.gz
Clarify who learns about ContactInfo.
Explicitly include bridges, and note that we archive and publish all descriptors. (We are not yet publishing ContactInfo lines contained in bridge descriptors, but maybe we'll want to do that soon, so let's err on the side of caution here.) Related to #9854.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt10
1 files changed, 7 insertions, 3 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index b20627546..0e7f088c9 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1383,9 +1383,13 @@ is non-zero):
descriptor to the public directory authorities.
[[ContactInfo]] **ContactInfo** __email_address__::
- Administrative contact information for server. This line might get picked
- up by spam harvesters, so you may want to obscure the fact that it's an
- email address.
+ Administrative contact information for this relay or bridge. This line
+ can be used to contact you if your relay or bridge is misconfigured or
+ something else goes wrong. Note that we archive and publish all
+ descriptors containing these lines and that Google indexes them, so
+ 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.
[[ExitPolicy]] **ExitPolicy** __policy__,__policy__,__...__::
Set an exit policy for this server. Each policy is of the form