[tor-commits] [tor/master] Merge remote-tracking branch 'samdney/ticket19209'

[nickm at torproject.org]

commit c897328feea549a391669c3fc93dc220d27e387c
Merge: d5d29cd 87b9194
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 12 08:58:04 2016 -0400

    Merge remote-tracking branch 'samdney/ticket19209'

 src/config/torrc.minimal.in-staging | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --cc src/config/torrc.minimal.in-staging
index d4dfd5f,e68f265..5fa37c1
--- a/src/config/torrc.minimal.in-staging
+++ b/src/config/torrc.minimal.in-staging
@@@ -98,8 -98,8 +98,9 @@@
  # OutboundBindAddress 10.0.0.5
  
  ## A handle for your relay, so people don't have to refer to it by key.
 -## Only alphanumeric characters, A-Z, a-z, 0-1 are allowed. No unicode, 
 +## Nicknames must be between 1 and 19 characters inclusive, and must
- ## contain only the characters [a-zA-Z0-9].
++## contain only the alphanumeric characters (a-z, A-Z, 0-9). No unicode,
+ ## no emoji.
  #Nickname ididnteditheconfig
  
  ## Define these to limit how much relayed traffic you will allow. Your
@@@ -130,9 -130,10 +131,12 @@@
  ## 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.
 -## Notice that "<" and ">" are necessary.
++## Notice that "<" and ">" are recommended.
  #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>
++## 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
++## to forge.
++#ContactInfo FFFFFFFFFFFFFFFFFFFF FFFFFFFFFFFFFFFFFFFF Random Person <nobody AT example dot com>
  
  ## Uncomment this to mirror directory information for others. Please do
  ## if you have enough bandwidth.
@@@ -149,11 -150,11 +153,12 @@@
  ## distribution for a sample.
  #DirPortFrontPage @CONFDIR@/tor-exit-notice.html
  
--## Uncomment this if you run more than one Tor relay, and add the identity
--## key fingerprint of each Tor relay you control, even if they're on
- ## different networks. You declare it here so Tor clients can avoid
- ## using more than one of your relays in a single circuit. See
 -## different networks. Include "$" with each key id. You declare it here so 
 -## Tor clients can avoid using more than one of your relays in a single circuit. See
--## https://www.torproject.org/docs/faq#MultipleRelays
++## Uncomment this if you run more than one Tor relay, and add the
++## identity key fingerprint of each Tor relay you control, even if
++## they're on different networks. Include "$" with each key id. You
++## declare it here so Tor clients can avoid using more than one of
++## your relays in a single circuit.
++## See https://www.torproject.org/docs/faq#MultipleRelays
  ## However, you should never include a bridge's fingerprint here, as it would
  ## break its concealability and potentially reveal its IP/TCP address.
  #MyFamily $keyid,$keyid,...
@@@ -203,4 -204,4 +208,3 @@@
  ## a private bridge, for example because you'll give out your bridge
  ## address manually to your friends, uncomment this line:
  #PublishServerDescriptor 0
--