diff options
| author | Roger Dingledine <arma@torproject.org> | 2014-02-06 12:28:49 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2014-02-06 12:28:49 -0500 |
| commit | d9c111d954c6b3b7cd4704b4bec8d830ffa056f6 (patch) | |
| tree | a47e2fc6f71140b70a27b9fe4534bc2932559ad7 | |
| parent | 3cb5c70beec5bf46b9e70b1fc6287a1c1c7847ee (diff) | |
| parent | 35115496511f64c08849a039c926910739467169 (diff) | |
| download | tor-d9c111d954c6b3b7cd4704b4bec8d830ffa056f6.tar.gz tor-d9c111d954c6b3b7cd4704b4bec8d830ffa056f6.zip | |
Merge branch 'maint-0.2.4' into release-0.2.4
| -rw-r--r-- | changes/bug10470 | 4 | ||||
| -rw-r--r-- | doc/tor.1.txt | 3 |
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. |