From 35115496511f64c08849a039c926910739467169 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 23 Dec 2013 19:00:46 -0500
Subject: [PATCH] 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(-)
 create mode 100644 changes/bug10470

diff --git a/changes/bug10470 b/changes/bug10470
new file mode 100644
index 000000000..2b753436d
--- /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 938ed2c78..3f8f6da03 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.