minimal backport of r10238

svn:r10302

2 files changed, 3 insertions, 7 deletions

diff --git a/doc/tor.1.in b/doc/tor.1.in
index 1a55f33d56..e6ae1713a5 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -417,13 +417,6 @@ but never attach a new stream to a circuit that is too old.
 (Default: 10 minutes)
 .LP
 .TP
-\fBNodeFamily \fR\fInickname\fR,\fInickname\fR,\fI...\fP
-The named Tor servers constitute a "family" of similar or co-administered
-servers, so never use any two of them in the same circuit. Defining a
-NodeFamily is only needed when a server doesn't list the family itself
-(with MyFamily). This option can be used multiple times.
-.LP
-.TP
 \fBEnforceDistinctSubnets \fR\fB0\fR|\fB1\fR\fP
 If 1, Tor will not put two servers whose IP addresses are "too
 close" on the same circuit.  Currently, two addresses are
diff --git a/src/or/config.c b/src/or/config.c
index c549af0822..f8d97eecc4 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2734,6 +2734,9 @@ options_validate(or_options_t *old_options, or_options_t *options,
     return -1;
   if (check_nickname_list(options->MyFamily, "MyFamily", msg))
     return -1;
+
+  if (options->NodeFamilies)
+    COMPLAIN("NodeFamily config option is broken in this version of Tor.");
   for (cl = options->NodeFamilies; cl; cl = cl->next) {
     if (check_nickname_list(cl->value, "NodeFamily", msg))
       return -1;