summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-01-09 15:40:40 -0500
committerNick Mathewson <nickm@torproject.org>2011-01-09 15:40:40 -0500
commit732275bb81992c33d6b707b64e621f161b97622a (patch)
tree1c318f45e4fbdeb06db1d93a681ca9d1a7cca117
parent54135b72f88e6b2301d80f583dfce8aba5d37b5a (diff)
downloadtor-732275bb81992c33d6b707b64e621f161b97622a.tar.gz
tor-732275bb81992c33d6b707b64e621f161b97622a.zip
Describe tor-resolve defaults. Bug 2364.
-rw-r--r--changes/bug23644
-rw-r--r--doc/tor-resolve.1.txt6
2 files changed, 9 insertions, 1 deletions
diff --git a/changes/bug2364 b/changes/bug2364
new file mode 100644
index 0000000000..37de6ef526
--- /dev/null
+++ b/changes/bug2364
@@ -0,0 +1,4 @@
+ o Documentation
+ - Document the default socks host and port (127.0.0.1:9050) for
+ tor-resolve.
+
diff --git a/doc/tor-resolve.1.txt b/doc/tor-resolve.1.txt
index eb519667b7..bdc636b08b 100644
--- a/doc/tor-resolve.1.txt
+++ b/doc/tor-resolve.1.txt
@@ -19,6 +19,10 @@ DESCRIPTION
**tor-resolve** is a simple script to connect to a SOCKS proxy that knows about
the SOCKS RESOLVE command, hand it a hostname, and return an IP address.
+By default, **tor-resolve** uses the Tor server running on 127.0.0.1 on SOCKS
+port 9050. If this isn't what you want, you should specify an explicit
+__sockshost__ and/or __socksport__ on the command line.
+
OPTIONS
-------
**-v**::
@@ -42,4 +46,4 @@ See doc/socks-extensions.txt in the Tor package for protocol details.
AUTHORS
-------
-Roger Dingledine <arma@mit.edu>, Nick Mathewson <nickm@alum.mit.edu>. \ No newline at end of file
+Roger Dingledine <arma@mit.edu>, Nick Mathewson <nickm@alum.mit.edu>.