Update sample torrc files to warn about not using BridgeRelay and MyFamily together

diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging
index 86429f117677e805008a9a0ac061a2494fcc1dc3..cb3adca35cb32ebd3aa1d4dc73f0339ad9b7ff2c 100644 (file)
--- a/src/config/torrc.minimal.in-staging
+++ b/src/config/torrc.minimal.in-staging
@@ -167,6 +167,7 @@
 ##
 ## If you are running multiple relays, you MUST set this option.
 ##
+## Note: do not use MyFamily on bridge relays.
 #MyFamily $keyid,$keyid,...
 
 ## Uncomment this if you want your relay to allow IPv6 exit traffic.
@@ -212,6 +213,9 @@
 ## won't be able to block all the bridges. Also, websites won't treat you
 ## differently because they won't know you're running Tor. If you can
 ## be a real relay, please do; but if not, be a bridge!
+##
+## Warning: when running your Tor as a bridge, make sure than MyFamily is
+## NOT configured.
 #BridgeRelay 1
 ## By default, Tor will advertise your bridge to users through various
 ## mechanisms like https://bridges.torproject.org/. If you want to run

diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 72cca0be31ba442b819afdc15a825bb6f728a880..8d56b0896bb29640a5b02ea596064d53d9c6f694 100644 (file)
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -169,6 +169,7 @@
 ##
 ## If you are running multiple relays, you MUST set this option.
 ##
+## Note: do not use MyFamily on bridge relays.
 #MyFamily $keyid,$keyid,...
 
 ## Uncomment this if you do *not* want your relay to allow any exit traffic.
@@ -218,6 +219,9 @@
 ## won't be able to block all the bridges. Also, websites won't treat you
 ## differently because they won't know you're running Tor. If you can
 ## be a real relay, please do; but if not, be a bridge!
+##
+## Warning: when running your Tor as a bridge, make sure than MyFamily is
+## NOT configured.
 #BridgeRelay 1
 ## By default, Tor will advertise your bridge to users through various
 ## mechanisms like https://bridges.torproject.org/. If you want to run