Add an EnforceDistinctSubnets option so that clients who know what they are doing (mainly people with private testing networks) can disable our same-/16 detection.

svn:r8504

2 files changed, 11 insertions, 3 deletions

diff --git a/doc/TODO b/doc/TODO
index 095284060..60f08dd23 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -28,11 +28,12 @@ N - when we start, remove any entryguards that are listed in excludenodes.
 N - Remember the last time we saw one of our entry guards labelled with
     the GUARD flag. If it's been too long, it is not suitable for use.
     If it's been really too long, remove it from the list.
-  . Figure out avoiding duplicate /24 lines
+  o Figure out avoiding duplicate /24 lines
     o automatically add /16 servers to family
     D do it in an efficient way. keep a list of something somewhere?
-      - The right thing here is to revamp our node selection implementation.
-N   - make it configurable, so people can turn it on or off.
+      D The right thing here is to revamp our node selection implementation.
+        (Deferred until oprofile says this matters.)
+    o make it configurable, so people can turn it on or off.
 N - Clients stop dumping old descriptors if the network-statuses
     claim they're still valid.
 R . If we fail to connect via an exit enclave, (warn and) try again
diff --git a/doc/tor.1.in b/doc/tor.1.in
index da4514562..e531d0746 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -371,10 +371,17 @@ 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 addressess are "too
+close" to appear on the same circuit.  Currently, two addresses are
+"too close" if they lie in the same /16 range. (Default: 1)
+
 .\" \fBPathlenCoinWeight \fR\fI0.0-1.0\fP
 .\" Paths are 3 hops plus a geometric distribution centered around this coinweight.
 .\" Must be >=0.0 and <1.0. (Default: 0.3) NOT USED CURRENTLY
 .\" .TP
+.LP
+.TP
 \fBRendNodes \fR\fInickname\fR,\fInickname\fR,\fI...\fP
 A list of preferred nodes to use for the rendezvous point, if possible.
 .LP