diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-12-23 19:01:29 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-12-23 19:01:29 -0500 |
| commit | 3121a6d0c8c8c3f7c01f09120dbe9c4f5a8adfdb (patch) | |
| tree | f60164f144091d4848631a186f6aab2a4e69cc5c | |
| parent | 107b347eb3b8e53fdf04cfe84a243bc5c9e5f8b0 (diff) | |
| parent | 35115496511f64c08849a039c926910739467169 (diff) | |
| download | tor-3121a6d0c8c8c3f7c01f09120dbe9c4f5a8adfdb.tar.gz tor-3121a6d0c8c8c3f7c01f09120dbe9c4f5a8adfdb.zip | |
Merge remote-tracking branch 'origin/maint-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 34a9f24eb6..28e7c5d7d1 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1799,7 +1799,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. |