[tor-commits] [tor/master] Make it clear that bridges should not be set in MyFamily

[nickm at torproject.org]

commit 116dcf6ca99b39173c28e7ff910ef0ec1181393d
Author: Daniel 'koolfy' Faucon <koolfy at geekmx.org>
Date:   Thu Mar 29 04:28:20 2012 +0200

    Make it clear that bridges should not be set in MyFamily
---
 src/config/torrc.bridge.in |    2 ++
 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 6e77ecc..927c7bb 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 1ea5d9f..17e3f0b 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