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

Make it clear that bridges should not be set in MyFamily

Browse Source
This commit is contained in:
Daniel 'koolfy' Faucon 2012-03-29 04:28:20 +02:00 committed by Nick Mathewson
parent c7cbd06d5f
commit 116dcf6ca9
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/torrc.bridge.in
View File

@ -140,6 +140,8 @@ DirPort 9030 # what port to advertise for directory connections
## different networks. You declare it here so Tor clients can avoid ## different networks. You declare it here so Tor clients can avoid
## using more than one of your relays in a single circuit. See ## using more than one of your relays in a single circuit. See
## https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#MultipleServers ## https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#MultipleServers
## However, you should never include a bridge's fingerprint here, as it would
## break its concealability and potentionally reveal its IP/TCP address.
#MyFamily $keyid,$keyid,... #MyFamily $keyid,$keyid,...
## A comma-separated list of exit policies. They're considered first ## A comma-separated list of exit policies. They're considered first

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

@ -144,6 +144,8 @@ SocksListenAddress 127.0.0.1 # accept connections only from localhost
## different networks. You declare it here so Tor clients can avoid ## different networks. You declare it here so Tor clients can avoid
## using more than one of your relays in a single circuit. See ## using more than one of your relays in a single circuit. See
## https://www.torproject.org/docs/faq#MultipleRelays ## https://www.torproject.org/docs/faq#MultipleRelays
## However, you should never include a bridge's fingerprint here, as it would
## break its concealability and potentionally reveal its IP/TCP address.
#MyFamily $keyid,$keyid,... #MyFamily $keyid,$keyid,...
## A comma-separated list of exit policies. They're considered first ## A comma-separated list of exit policies. They're considered first