[tor-commits] [tor/master] Clarify DirPort multiplicity

[nickm at torproject.org]

commit 35115496511f64c08849a039c926910739467169
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 23 19:00:46 2013 -0500

    Clarify DirPort multiplicity
    
    Fix for #10470 as suggested by arma
---
 changes/bug10470 |    4 ++++
 doc/tor.1.txt    |    3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug10470 b/changes/bug10470
new file mode 100644
index 0000000..2b75343
--- /dev/null
+++ b/changes/bug10470
@@ -0,0 +1,4 @@
+  o Documentation fixes:
+    - Note that all but one DirPort entry must have the NoAdvertise flag
+      set. Fix for #10470.
+
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 938ed2c..3f8f6da 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1763,7 +1763,8 @@ if DirPort is non-zero):
 [[DirPort]] **DirPort** \['address':]__PORT__|**auto** [_flags_]::
     If this option is nonzero, advertise the directory service on this port.
     Set it to "auto" to have Tor pick a port for you.  This option can occur
-    more than once. (Default: 0)
+    more than once, but only one advertised DirPort is supported: all
+    but one DirPort must have the **NoAdvertise** flag set. (Default: 0)
 +
     The same flags are supported here as are supported by ORPort.