[or-cvs] r8528: Note that EnforceDistinctSubnets can override subnet rule fo (in tor/trunk: . doc)

[nickm@xxxxxxxx]

Author: nickm
Date: 2006-09-29 00:51:23 -0400 (Fri, 29 Sep 2006)
New Revision: 8528

Modified:
   tor/trunk/
   tor/trunk/doc/path-spec.txt
Log:
 r8775@totoro:  nickm | 2006-09-29 00:29:02 -0400
 Note that EnforceDistinctSubnets can override subnet rule for path generation.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r8775] on 96637b51-b116-0410-a10e-9941ebb49b64

Modified: tor/trunk/doc/path-spec.txt
===================================================================
--- tor/trunk/doc/path-spec.txt	2006-09-29 03:50:11 UTC (rev 8527)
+++ tor/trunk/doc/path-spec.txt	2006-09-29 04:51:23 UTC (rev 8528)
@@ -139,7 +139,7 @@
      - We do not choose any router in the same family as another in the same
        path.
      - We do not choose any router in the same /16 subnet as another in the
-       same path.
+       same path (unless EnforceDistinctSubnets is 0).
      - We don't choose any non-running or non-valid router unless we have
        been configured to do so. By default, we are configured to allow
        non-valid routers in "middle" and "rendezvous" positions.