diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-07 12:51:34 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-07 12:51:34 -0500 |
| commit | 3bcba6d7161cca8db63c6fb21947561cfdbda40e (patch) | |
| tree | 026167d6f57b1dc0445c892b356fa494d53586c5 /doc | |
| parent | ff5810aea91fed15a6401f0f825bb9fbe16ca200 (diff) | |
| parent | fcf3eb03bd11421a799cc1793ddb0d5d3e33320b (diff) | |
| download | tor-3bcba6d7161cca8db63c6fb21947561cfdbda40e.tar.gz tor-3bcba6d7161cca8db63c6fb21947561cfdbda40e.zip | |
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 98415e8b63..21298057c0 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -668,7 +668,7 @@ The following options are useful only for clients (that is, if **VirtualAddrNetwork** __Address__/__bits__:: When Tor needs to assign a virtual (unused) address because of a MAPADDRESS - command from the controller or the AutpmapHostsOnResolve feature, Tor + command from the controller or the AutomapHostsOnResolve feature, Tor picks an unassigned address from this range. (Default: 127.192.0.0/10) + + |