3 files changed, 21 insertions, 13 deletions
diff --git a/src/config/mmdb-convert.py b/src/config/mmdb-convert.py
index cbe9acdc5d..3a454a3fc1 100644
--- a/src/config/mmdb-convert.py
+++ b/src/config/mmdb-convert.py
@@ -20,7 +20,7 @@
 
    When given a simplicity/speed tradeoff, it opts for simplicity.
 
-   You will not understand the code without undestanding the MaxMind-DB
+   You will not understand the code without understanding the MaxMind-DB
    file format.  It is specified at:
    https://github.com/maxmind/MaxMind-DB/blob/master/MaxMind-DB-spec.md.
 
@@ -257,7 +257,7 @@ IGNORE_LEN_TYPES = set([
     TP_ARRAY,  # Length is number of members that follow.
     TP_PTR,    # Length is index to pointed-to data element.
     TP_BOOL,   # Length is 0 or 1.
-    TP_DCACHE, # Length isnumber of members that follow
+    TP_DCACHE, # Length is number of members that follow
 ])
 
 def parse_data_section(s):
@@ -265,7 +265,7 @@ def parse_data_section(s):
        Datum items."""
 
     # Stack of possibly nested containers.  We use the 'nChildren' member of
-    # the last one to tell how many moreitems nest directly inside.
+    # the last one to tell how many more items nest directly inside.
     stack = []
 
     # List of all items, including nested ones.
diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging
index 248cb5cf02..c537c51f9b 100644
--- a/src/config/torrc.minimal.in-staging
+++ b/src/config/torrc.minimal.in-staging
@@ -98,11 +98,14 @@
 # OutboundBindAddress 10.0.0.5
 
 ## A handle for your relay, so people don't have to refer to it by key.
+## Nicknames must be between 1 and 19 characters inclusive, and must
+## 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
 ## own traffic is still unthrottled. Note that RelayBandwidthRate must
-## be at least 20 kilobytes per second.
+## be at least 75 kilobytes per second.
 ## Note that units for these config options are bytes (per second), not
 ## bits (per second), and that prefixes are binary prefixes, i.e. 2^10,
 ## 2^20, etc.
@@ -128,9 +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 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.
@@ -147,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
-## 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,...
@@ -201,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
-
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 248cb5cf02..5328206da9 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -98,11 +98,13 @@
 # OutboundBindAddress 10.0.0.5
 
 ## A handle for your relay, so people don't have to refer to it by key.
+## Nicknames must be between 1 and 19 characters inclusive, and must
+## contain only the characters [a-zA-Z0-9].
 #Nickname ididnteditheconfig
 
 ## Define these to limit how much relayed traffic you will allow. Your
 ## own traffic is still unthrottled. Note that RelayBandwidthRate must
-## be at least 20 kilobytes per second.
+## be at least 75 kilobytes per second.
 ## Note that units for these config options are bytes (per second), not
 ## bits (per second), and that prefixes are binary prefixes, i.e. 2^10,
 ## 2^20, etc.