nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/maint-0.2.2'

Browse Source
This commit is contained in:
Nick Mathewson 2011-01-09 15:43:05 -05:00
commit 9bbb4a1b40
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug2364 Normal file
View File

@ -0,0 +1,4 @@
o Documentation
- Document the default socks host and port (127.0.0.1:9050) for
tor-resolve.

6
doc/tor-resolve.1.txt
View File

@ -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>.
Roger Dingledine <arma@mit.edu>, Nick Mathewson <nickm@alum.mit.edu>.