From: rl1987 <rl1987@sdf.lonestar.org>
Date: Sun, 2 Sep 2018 18:06:34 +0000 (+0300)
Subject: In manpage, warn about combination of MyFamily and BridgeRelay being bad
X-Git-Tag: tor-0.3.5.1-alpha~93^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5db6cf7cbd4761d7bef3b280af473ef5d9d14624;p=thirdparty%2Ftor.git

In manpage, warn about combination of MyFamily and BridgeRelay being bad
---

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 7b6c21a74e..37c97dc3fa 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1803,7 +1803,10 @@ is non-zero):
     Sets the relay to act as a "bridge" with respect to relaying connections
     from bridge users to the Tor network. It mainly causes Tor to publish a
     server descriptor to the bridge database, rather than
-    to the public directory authorities.
+    to the public directory authorities. +
+ +
+    Note: make sure that no MyFamily lines are present in your torrc when
+    relay is configured in bridge mode.
 
 [[BridgeDistribution]] **BridgeDistribution** __string__::
     If set along with BridgeRelay, Tor will include a new line in its
@@ -2060,7 +2063,10 @@ is non-zero):
     nickname: fingerprints are more reliable. +
  +
     If you run more than one relay, the MyFamily option on each relay
-    **must** list all other relays, as described above.
+    **must** list all other relays, as described above. +
+ +
+    Note: do not use MyFamily when configuring your Tor instance as a
+    brigde.
 
 [[Nickname]] **Nickname** __name__::
     Set the server's nickname to \'name'. Nicknames must be between 1 and 19