diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-06 09:47:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-06 09:47:32 -0400 |
| commit | 8815960c4615da0015e78c3256c3f611a30f6e6c (patch) | |
| tree | e6659be5abd68f92d88684f7904ea775a5bcf5a3 /doc | |
| parent | 6edee54afaaa60f34bed0dedb2792766f8683cd5 (diff) | |
| parent | 326b510bae0b0d479dd924a233c6f6150737eb8b (diff) | |
| download | tor-8815960c4615da0015e78c3256c3f611a30f6e6c.tar.gz tor-8815960c4615da0015e78c3256c3f611a30f6e6c.zip | |
Merge remote-tracking branch 'tor-github/pr/294'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 37c97dc3fa..869a8cedd7 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2804,7 +2804,7 @@ The following options are used to configure a hidden service. paths may be quoted, and may use standard C escapes.) You may also have multiple lines with the same VIRTPORT: when a user connects to that VIRTPORT, one of the TARGETs from those lines will be - chosen at random. + chosen at random. Note that address-port pairs have to be comma-separated. [[PublishHidServDescriptors]] **PublishHidServDescriptors** **0**|**1**:: If set to 0, Tor will run any hidden services you configure, but it won't |