[tor-commits] [tor/master] Merge branch 'bug24526_squashed'

[nickm at torproject.org]

commit c349bfec36ccb31a202e1ad0421b3fb1a3e4ee16
Merge: e8bd80641 ac0f819ce
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 11 12:33:52 2018 -0500

    Merge branch 'bug24526_squashed'

 changes/bug24526                    |  4 ++++
 doc/tor.1.txt                       | 13 +++++++++++--
 src/config/torrc.minimal.in-staging |  6 ++++++
 src/config/torrc.sample.in          |  6 ++++++
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --cc src/config/torrc.minimal.in-staging
index 4fede6dcf,299f1685d..90f91e5cb
--- a/src/config/torrc.minimal.in-staging
+++ b/src/config/torrc.minimal.in-staging
@@@ -161,12 -164,11 +164,15 @@@
  ## 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.
+ ##
+ ## If you are running multiple relays, you MUST set this option.
+ ##
  #MyFamily $keyid,$keyid,...
  
 +## Uncomment this if you want your relay to allow IPv6 exit traffic.
 +## (Relays only allow IPv4 exit traffic by default.)
 +#IPv6Exit 1
 +
  ## A comma-separated list of exit policies. They're considered first
  ## to last, and the first match wins.
  ##
diff --cc src/config/torrc.sample.in
index 865e9f660,8923d4602..4e183478e
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@@ -162,16 -164,11 +165,19 @@@
  ## 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.
+ ##
+ ## If you are running multiple relays, you MUST set this option.
+ ##
  #MyFamily $keyid,$keyid,...
  
 +## Uncomment this if you do *not* want your relay to allow any exit traffic.
 +## (Relays allow exit traffic by default.)
 +#ExitRelay 0
 +
 +## Uncomment this if you want your relay to allow IPv6 exit traffic.
 +## (Relays only allow IPv4 exit traffic by default.)
 +#IPv6Exit 1
 +
  ## A comma-separated list of exit policies. They're considered first
  ## to last, and the first match wins.
  ##