mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4'

Browse source
This commit is contained in:
Nick Mathewson 2013-12-23 19:01:29 -05:00
commit 3121a6d0c8
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

@ -1799,7 +1799,8 @@ if DirPort is non-zero):
[[DirPort]] **DirPort** \['address':]__PORT__|**auto** [_flags_]:: [[DirPort]] **DirPort** \['address':]__PORT__|**auto** [_flags_]::
If this option is nonzero, advertise the directory service on this port. 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 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. The same flags are supported here as are supported by ORPort.