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

[nickm at torproject.org]

commit 73a0bb16b9b750be9a51470ff57ee654787836d9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 9 12:02:53 2013 -0400

    Partially revert "Clarify who learns about ContactInfo."
    
    This reverts the torrc.sample.in changes from commit
    66a04a6ac334775dc396025e0c15fa49eca138a7.
    
    We're going to not make this change in 0.2.4, since changing
    torrc.sample.in makes all the debian users do some pointless
    busywork. see tor-dev discusion of 9 Oct 2013.
---
 src/config/torrc.sample.in |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 78013c2..c667efc 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -120,12 +120,9 @@
 ## is per month)
 #AccountingStart month 3 15:00
 
-## 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.
+## 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.
 #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>