summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2018-05-08 13:49:56 -0400
committerRoger Dingledine <arma@torproject.org>2018-05-08 13:49:56 -0400
commitbf5eaa82da4214be681cf0674f24376b7c4c0e34 (patch)
treefdf4b013cef58e2bd7df28cec771b3543076b74d /doc
parentc3ae14549d48cf9266b6442cce3bb15df613a7a8 (diff)
parentb979415e8bf4c33e6d540c780edeeb40bce5e512 (diff)
downloadtor-bf5eaa82da4214be681cf0674f24376b7c4c0e34.tar.gz
tor-bf5eaa82da4214be681cf0674f24376b7c4c0e34.zip
Merge branch 'maint-0.3.3'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index dc0eaba283..3552dc5014 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1237,7 +1237,7 @@ The following options are useful only for clients (that is, if
flag is not supported.
**CacheIPv4DNS**;;
Tells the client to remember IPv4 DNS answers we receive from exit
- nodes via this connection. (On by default.)
+ nodes via this connection.
**CacheIPv6DNS**;;
Tells the client to remember IPv6 DNS answers we receive from exit
nodes via this connection.