nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
rl1987 2018-09-02 21:11:52 +03:00
parent 5db6cf7cbd
commit ce4f73f8a3
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/config/torrc.minimal.in-staging
View File

@ -167,6 +167,7 @@
## ##
## If you are running multiple relays, you MUST set this option. ## If you are running multiple relays, you MUST set this option.
## ##
## Note: do not use MyFamily on bridge relays.
#MyFamily $keyid,$keyid,... #MyFamily $keyid,$keyid,...
## Uncomment this if you want your relay to allow IPv6 exit traffic. ## 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 ## 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 ## 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! ## 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 #BridgeRelay 1
## By default, Tor will advertise your bridge to users through various ## By default, Tor will advertise your bridge to users through various
## mechanisms like https://bridges.torproject.org/. If you want to run ## mechanisms like https://bridges.torproject.org/. If you want to run

4
src/config/torrc.sample.in
View File

@ -169,6 +169,7 @@
## ##
## If you are running multiple relays, you MUST set this option. ## If you are running multiple relays, you MUST set this option.
## ##
## Note: do not use MyFamily on bridge relays.
#MyFamily $keyid,$keyid,... #MyFamily $keyid,$keyid,...
## Uncomment this if you do *not* want your relay to allow any exit traffic. ## 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 ## 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 ## 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! ## 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 #BridgeRelay 1
## By default, Tor will advertise your bridge to users through various ## By default, Tor will advertise your bridge to users through various
## mechanisms like https://bridges.torproject.org/. If you want to run ## mechanisms like https://bridges.torproject.org/. If you want to run