aboutsummaryrefslogtreecommitdiff
path: root/src/config
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-10-09 09:45:21 -0400
committerNick Mathewson <nickm@torproject.org>2013-10-09 09:45:21 -0400
commit882fb8383da941ec8bec7a698caacd5924f25892 (patch)
treeb0337af07992d99951fe7a9bc34c20ab7160e2e0 /src/config
parent9de456a303f1931bef43e5a48afdf08293279c45 (diff)
parent270dcc9131668c914c8a59e615c786ca2f4fb334 (diff)
downloadtor-882fb8383da941ec8bec7a698caacd5924f25892.tar
tor-882fb8383da941ec8bec7a698caacd5924f25892.tar.gz
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/config')
-rw-r--r--src/config/torrc.sample.in9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index c667efc5c..78013c2f1 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>