Browse Source

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

Nick Mathewson 10 years ago
parent
commit
3121a6d0c8
2 changed files with 6 additions and 1 deletions
  1. 4 0
      changes/bug10470
  2. 2 1
      doc/tor.1.txt

+ 4 - 0
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.
+

+ 2 - 1
doc/tor.1.txt

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