summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-05-04 15:13:15 -0400
committerNick Mathewson <nickm@torproject.org>2016-05-04 15:13:15 -0400
commit27c1b0ea4330e4aee8b464543bbe03b932005368 (patch)
tree3237634493c7ff5359a1ab250e81caba2acb14c0 /doc
parent2384256a3719fbc31793228b0b34716b7817d15e (diff)
parent60274296c3e012bb0ca5ad3214e2b8aa0fe19e82 (diff)
downloadtor-27c1b0ea4330e4aee8b464543bbe03b932005368.tar.gz
tor-27c1b0ea4330e4aee8b464543bbe03b932005368.zip
Merge branch 'maint-0.2.8'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 262a36ee9f..787223d701 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -961,12 +961,12 @@ The following options are useful only for clients (that is, if
When a request for address arrives to Tor, it will transform to newaddress
before processing it. For example, if you always want connections to
www.example.com to exit via __torserver__ (where __torserver__ is the
- nickname of the server), use "MapAddress www.example.com
+ fingerprint of the server), use "MapAddress www.example.com
www.example.com.torserver.exit". If the value is prefixed with a
"\*.", matches an entire domain. For example, if you
always want connections to example.com and any if its subdomains
to exit via
- __torserver__ (where __torserver__ is the nickname of the server), use
+ __torserver__ (where __torserver__ is the fingerprint of the server), use
"MapAddress \*.example.com \*.example.com.torserver.exit". (Note the
leading "*." in each part of the directive.) You can also redirect all
subdomains of a domain to a single address. For example, "MapAddress