diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-04 11:08:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-04 11:08:49 -0400 |
| commit | fd994f55c441922d3c5ae19ad5c254a1ae1eccfd (patch) | |
| tree | 6f20f3189d1c2b6b850c082d3cd3954fe562c558 /src | |
| parent | 1e71e2c1045377b85d38760e257dd9c57c959c9f (diff) | |
| parent | 19f73f633628a093a6d9af4d0dfeeed402afa939 (diff) | |
| download | tor-fd994f55c441922d3c5ae19ad5c254a1ae1eccfd.tar.gz tor-fd994f55c441922d3c5ae19ad5c254a1ae1eccfd.zip | |
Merge remote-tracking branch 'rl1987/doc26908'
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/torrc.minimal.in-staging | 4 | ||||
| -rw-r--r-- | src/config/torrc.sample.in | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index 86429f1176..cb3adca35c 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 72cca0be31..8d56b0896b 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 |