diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-01-07 08:51:37 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-01-07 08:51:37 -0500 |
| commit | 0402746a990a496ccd82708f5b676b4eca0521fa (patch) | |
| tree | b89f7b78512aa66b22b05a26e53eb7ba86fb16e6 | |
| parent | 7a7685955ec9ba464aee0ad67523219c3ad70f84 (diff) | |
| parent | 8eadfad71daaad985ac1262436bc232d4b184d71 (diff) | |
| download | tor-0402746a990a496ccd82708f5b676b4eca0521fa.tar.gz tor-0402746a990a496ccd82708f5b676b4eca0521fa.zip | |
Merge remote-tracking branch 'rl1987/doc28805'
| -rw-r--r-- | changes/doc28805 | 4 | ||||
| -rw-r--r-- | doc/tor.1.txt | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changes/doc28805 b/changes/doc28805 new file mode 100644 index 0000000000..6c9fea44fa --- /dev/null +++ b/changes/doc28805 @@ -0,0 +1,4 @@ + o Documentation (manpage): + - Improve ControlPort description in tor manpage to mention that it + accepts address/port pair, and can be used multiple times. Closes ticket + 28805. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 4ff789a931..b058bebcb3 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -350,7 +350,7 @@ GENERAL OPTIONS all sockets will be set to this limit. Must be a value between 2048 and 262144, in 1024 byte increments. Default of 8192 is recommended. -[[ControlPort]] **ControlPort** __PORT__|**unix:**__path__|**auto** [__flags__]:: +[[ControlPort]] **ControlPort** \['address':]__port__|**unix:**__path__|**auto** [__flags__]:: If set, Tor will accept connections on this port and allow those connections to control the Tor process using the Tor Control Protocol (described in control-spec.txt in @@ -361,7 +361,8 @@ GENERAL OPTIONS methods means either method is sufficient to authenticate to Tor.) This option is required for many Tor controllers; most use the value of 9051. If a unix domain socket is used, you may quote the path using standard - C escape sequences. + C escape sequences. You can specify this directive multiple times, to + bind to multiple address/port pairs. Set it to "auto" to have Tor pick a port for you. (Default: 0) + + Recognized flags are... |