commit ce4f73f8a341335832974c200f4a7050aec89c72 Author: rl1987 rl1987@sdf.lonestar.org Date: Sun Sep 2 21:11:52 2018 +0300
Update sample torrc files to warn about not using BridgeRelay and MyFamily together --- src/config/torrc.minimal.in-staging | 4 ++++ src/config/torrc.sample.in | 4 ++++ 2 files changed, 8 insertions(+)
diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index 86429f117..cb3adca35 100644 --- 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 72cca0be3..8d56b0896 100644 --- 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