summaryrefslogtreecommitdiff
path: root/doc/tor.1.in
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-05-29 18:58:16 +0000
committerNick Mathewson <nickm@torproject.org>2007-05-29 18:58:16 +0000
commit3f9afa06250febe954c8bcebbea3a21c398e89a1 (patch)
treed9dbc7a85e0fa5fe80dcc3bc819dad818d1ec694 /doc/tor.1.in
parente11a92bd54926cfa8fd75c3a73d93ab2e1fbc007 (diff)
downloadtor-3f9afa06250febe954c8bcebbea3a21c398e89a1.tar.gz
tor-3f9afa06250febe954c8bcebbea3a21c398e89a1.zip
r13068@catbus: nickm | 2007-05-29 14:58:13 -0400
Add some code to mitigate bug 393: Choose at random from multiple hidden service ports with the same virtport. This allows limited ad-hoc round-robining. svn:r10398
Diffstat (limited to 'doc/tor.1.in')
-rw-r--r--doc/tor.1.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 0e9a694161..93dd90f989 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -981,7 +981,9 @@ Configure a virtual port VIRTPORT for a hidden service. You may use this
option multiple times; each time applies to the service using the most recent
hiddenservicedir. By default, this option maps the virtual port to the
same port on 127.0.0.1. You may override the target port, address, or both
-by specifying a target of addr, port, or addr:port.
+by specifying a target of addr, port, or addr:port. 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.
.LP
.TP
\fBHiddenServiceNodes \fR\fInickname\fR,\fInickname\fR,\fI...\fP