diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-04-26 20:30:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-04-26 20:30:59 -0400 |
| commit | 92615f608c2fd1b5da29068498c5fe473105e88f (patch) | |
| tree | 173795ffbdcb1dbd50abc84ce2624be510910b25 | |
| parent | de08f2d96bd1815a8da5c359a4f52310dc1905d7 (diff) | |
| download | tor-92615f608c2fd1b5da29068498c5fe473105e88f.tar.gz tor-92615f608c2fd1b5da29068498c5fe473105e88f.zip | |
Do not recommend use of nicknames in MapAddress manpage
| -rw-r--r-- | changes/bug18312 | 4 | ||||
| -rw-r--r-- | doc/tor.1.txt | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug18312 b/changes/bug18312 new file mode 100644 index 0000000000..7dcb3266bf --- /dev/null +++ b/changes/bug18312 @@ -0,0 +1,4 @@ + o Documentation: + - Stop recommending use of nicknames to identify relays in our + MapAddress documentation. Closes ticket 18312. + 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 |