[tor-commits] [tor/master] Clarify who learns about ContactInfo.

[nickm at torproject.org]

commit 66a04a6ac334775dc396025e0c15fa49eca138a7
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Wed Oct 9 12:01:45 2013 +0200

    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.
---
 doc/tor.1.txt              |   10 +++++++---
 src/config/torrc.sample.in |    9 ++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index b206275..0e7f088 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
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index c667efc..78013c2 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -120,9 +120,12 @@
 ## is per month)
 #AccountingStart month 3 15:00
 
-## Contact info to be published in the directory, so we can contact you
-## if your relay is misconfigured or something else goes wrong. Google
-## indexes this, so spammers might also collect it.
+## 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.
 #ContactInfo Random Person <nobody AT example dot com>
 ## You might also include your PGP or GPG fingerprint if you have one:
 #ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com>