瀏覽代碼

Document that the ORPort flags apply to DirPort too. (thanks, Roger.)

Nick Mathewson 13 年之前
父節點
當前提交
400c7ce2b6
共有 2 個文件被更改,包括 9 次插入3 次删除
  1. 3 2
      changes/bug5597
  2. 6 1
      doc/tor.1.txt

+ 3 - 2
changes/bug5597

@@ -1,3 +1,4 @@
   o Documentation:
   o Documentation:
-    - Document the changes to the ORPort option, and the fact that
-      ORListenAddress is now unnecessary (and therefore deprecated).
+    - Document the changes to the ORPort and DirPort options, and the
+      fact that {OR/Dir}ListenAddress is now unnecessary (and
+      therefore deprecated).

+ 6 - 1
doc/tor.1.txt

@@ -1463,15 +1463,20 @@ if DirPort is non-zero):
     Minimum uptime of a v2 hidden service directory to be accepted as such by
     Minimum uptime of a v2 hidden service directory to be accepted as such by
     authoritative directories. (Default: 25 hours)
     authoritative directories. (Default: 25 hours)
 
 
-**DirPort** __PORT__|**auto**::
+**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.  (Default: 0)
     Set it to "auto" to have Tor pick a port for you.  (Default: 0)
++
+    The same flags are supported here as are supported by ORPort.
 
 
 **DirListenAddress** __IP__[:__PORT__]::
 **DirListenAddress** __IP__[:__PORT__]::
     Bind the directory service to this address. If you specify a port, bind to
     Bind the directory service to this address. If you specify a port, bind to
     this port rather than the one specified in DirPort.  (Default: 0.0.0.0)
     this port rather than the one specified in DirPort.  (Default: 0.0.0.0)
     This directive can be specified multiple times  to bind to multiple
     This directive can be specified multiple times  to bind to multiple
     addresses/ports.
     addresses/ports.
++
+    This option is deprecated; you can get the same behavior with DirPort now
+    that it supports NoAdvertise and explicit addresses.
 
 
 **DirPolicy** __policy__,__policy__,__...__::
 **DirPolicy** __policy__,__policy__,__...__::
     Set an entrance policy for this server, to limit who can connect to the
     Set an entrance policy for this server, to limit who can connect to the