summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-03-10 10:06:48 -0500
committerDavid Goulet <dgoulet@torproject.org>2021-03-10 10:06:48 -0500
commit8c4581865e5fccf25a3ce78c8175a73bbb1ec7f5 (patch)
treefc0df936a586c2a1b27087a44b1d752f43fdb417
parentc1b43d79eb35a33e149ea43d9f431cc8afdcef4c (diff)
parentd382f26914590623954ad2f20f1cc06a3733e6a8 (diff)
downloadtor-8c4581865e5fccf25a3ce78c8175a73bbb1ec7f5.tar.gz
tor-8c4581865e5fccf25a3ce78c8175a73bbb1ec7f5.zip
Merge branch 'maint-0.4.5' into release-0.4.5
-rw-r--r--changes/bug40256_0453
-rw-r--r--doc/man/tor.1.txt5
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug40256_045 b/changes/bug40256_045
new file mode 100644
index 0000000000..14e67659e0
--- /dev/null
+++ b/changes/bug40256_045
@@ -0,0 +1,3 @@
+ o Minor bugfixes (documentation):
+ - Fix a formatting error on the documentation for
+ VirtualAddrNetworkIPv6. Fixes bug 40256; bugfix on 0.2.9.4-alpha.
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index 58774e555f..b57c6ec70a 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -1797,8 +1797,9 @@ The following options are useful only for clients (that is, if
The default **VirtualAddrNetwork** address ranges on a
properly configured machine will route to the loopback or link-local
interface. The maximum number of bits for the network prefix is set to 104
- for IPv6 and 16 for IPv4. However, a wider network - smaller prefix length
- - is preferable since it reduces the chances for an attacker to guess the
+ for IPv6 and 16 for IPv4. However, a larger network
+ (that is, one with a smaller prefix length)
+ is preferable, since it reduces the chances for an attacker to guess the
used IP. For local use, no change to the default VirtualAddrNetwork setting
is needed.