sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.4' into release-0.2.4

This commit is contained in:
Roger Dingledine 2014-02-06 12:28:49 -05:00
parent 3cb5c70bee 3511549651
commit d9c111d954
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug10470 Normal file
View File

@ -0,0 +1,4 @@
o Documentation fixes:
- Note that all but one DirPort entry must have the NoAdvertise flag
set. Fix for #10470.

3
doc/tor.1.txt
View File

@ -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.