aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug55975
-rw-r--r--doc/tor.1.txt7
2 files changed, 9 insertions, 3 deletions
diff --git a/changes/bug5597 b/changes/bug5597
index a6c30d7d1..90a80a668 100644
--- a/changes/bug5597
+++ b/changes/bug5597
@@ -1,3 +1,4 @@
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).
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index b6fd826d2..8e0020a4f 100644
--- a/doc/tor.1.txt
+++ b/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
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.
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__]::
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 directive can be specified multiple times to bind to multiple
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__,__...__::
Set an entrance policy for this server, to limit who can connect to the