diff options
| author | Daniel 'koolfy' Faucon <koolfy@geekmx.org> | 2012-03-29 04:28:20 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-04-02 18:16:13 -0400 |
| commit | 116dcf6ca99b39173c28e7ff910ef0ec1181393d (patch) | |
| tree | e65f67da579b3f3bfd9e05f1ed4ca0aa13a3d689 | |
| parent | c7cbd06d5f2727c3742dfd426223f1f1ebe46f94 (diff) | |
| download | tor-116dcf6ca99b39173c28e7ff910ef0ec1181393d.tar.gz tor-116dcf6ca99b39173c28e7ff910ef0ec1181393d.zip | |
Make it clear that bridges should not be set in MyFamily
| -rw-r--r-- | src/config/torrc.bridge.in | 2 | ||||
| -rw-r--r-- | src/config/torrc.sample.in | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/config/torrc.bridge.in b/src/config/torrc.bridge.in index 6e77ecc92f..927c7bbba2 100644 --- a/src/config/torrc.bridge.in +++ b/src/config/torrc.bridge.in @@ -140,6 +140,8 @@ DirPort 9030 # what port to advertise for directory connections ## different networks. You declare it here so Tor clients can avoid ## using more than one of your relays in a single circuit. See ## 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,... ## A comma-separated list of exit policies. They're considered first diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 1ea5d9ff4e..17e3f0b2a4 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -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 ## using more than one of your relays in a single circuit. See ## 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,... ## A comma-separated list of exit policies. They're considered first |