diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-02-13 11:38:35 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-02-13 11:38:35 -0500 |
| commit | 5687165cf1aec8e3b7356ab842624d36f56318fc (patch) | |
| tree | af9bc9bc46f3596d6005a8333064c7c4ea9d967a | |
| parent | d043096d596b7c83de354776a2ee1a799c8b6a5d (diff) | |
| parent | 58cbe517084d4ec8cd4ff3c297f841e561804cc3 (diff) | |
| download | tor-5687165cf1aec8e3b7356ab842624d36f56318fc.tar.gz tor-5687165cf1aec8e3b7356ab842624d36f56318fc.zip | |
Merge remote-tracking branch 'tor-github/pr/674'
| -rw-r--r-- | changes/doc28623 | 3 | ||||
| -rw-r--r-- | doc/tor.1.txt | 13 |
2 files changed, 10 insertions, 6 deletions
diff --git a/changes/doc28623 b/changes/doc28623 new file mode 100644 index 0000000000..3c3313abdd --- /dev/null +++ b/changes/doc28623 @@ -0,0 +1,3 @@ + o Documentation: + - In manpage entry describing MapAddress torrc setting, use example + IP addresses from ranges specified by RFC 5737. Resolves issue 28623. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 00d6929c19..eb16037430 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1159,17 +1159,18 @@ The following options are useful only for clients (that is, if 1. When evaluating MapAddress expressions Tor stops when it hits the most recently added expression that matches the requested address. So if you - have the following in your torrc, www.torproject.org will map to 1.1.1.1: + have the following in your torrc, www.torproject.org will map to + 198.51.100.1: - MapAddress www.torproject.org 2.2.2.2 - MapAddress www.torproject.org 1.1.1.1 + MapAddress www.torproject.org 192.0.2.1 + MapAddress www.torproject.org 198.51.100.1 2. Tor evaluates the MapAddress configuration until it finds no matches. So if you have the following in your torrc, www.torproject.org will map to - 2.2.2.2: + 203.0.113.1: - MapAddress 1.1.1.1 2.2.2.2 - MapAddress www.torproject.org 1.1.1.1 + MapAddress 198.51.100.1 203.0.113.1 + MapAddress www.torproject.org 198.51.100.1 3. The following MapAddress expression is invalid (and will be ignored) because you cannot map from a specific address to a wildcard |