summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-12-23 19:00:46 -0500
committerNick Mathewson <nickm@torproject.org>2013-12-23 19:00:46 -0500
commit35115496511f64c08849a039c926910739467169 (patch)
tree564a5a83f21a3f9a6483e77d0ee632f6134b75b5
parent59a162f7d2048bc5e6bbc953c2bdc76a0367221b (diff)
downloadtor-35115496511f64c08849a039c926910739467169.tar.gz
tor-35115496511f64c08849a039c926910739467169.zip
Clarify DirPort multiplicity
Fix for #10470 as suggested by arma
-rw-r--r--changes/bug104704
-rw-r--r--doc/tor.1.txt3
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug10470 b/changes/bug10470
new file mode 100644
index 0000000000..2b753436d9
--- /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 938ed2c782..3f8f6da036 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.