Browse Source

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

rl1987 5 years ago
parent
commit
ce4f73f8a3
2 changed files with 8 additions and 0 deletions
  1. 4 0
      src/config/torrc.minimal.in-staging
  2. 4 0
      src/config/torrc.sample.in

+ 4 - 0
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

+ 4 - 0
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