]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Make it clear that bridges should not be set in MyFamily
authorDaniel 'koolfy' Faucon <koolfy@geekmx.org>
Thu, 29 Mar 2012 02:28:20 +0000 (04:28 +0200)
committerNick Mathewson <nickm@torproject.org>
Mon, 2 Apr 2012 22:16:13 +0000 (18:16 -0400)
src/config/torrc.bridge.in
src/config/torrc.sample.in

index 6e77ecc92fb0d1261b247063b114bd160ccc15af..927c7bbba24036d8b586bbc2340450b687bb8f79 100644 (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
 ## 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
index 1ea5d9ff4e72ba670b34bbfda65cf8ba14e28600..17e3f0b2a4562933251ef84fcfdd14ea15f8bf95 100644 (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
 ## 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