aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2004-10-28 20:30:10 +0000
committerNick Mathewson <nickm@torproject.org>2004-10-28 20:30:10 +0000
commit7fda3df9dd236bc14bb98d1395dd141eab4ff43f (patch)
tree5b3373a2a094fea664d3ea512325a7168d89010e /contrib
parent54b8f7e50394e77bd34a0c56aac11abf4484e240 (diff)
downloadtor-7fda3df9dd236bc14bb98d1395dd141eab4ff43f.tar
tor-7fda3df9dd236bc14bb98d1395dd141eab4ff43f.tar.gz
Rename Python tor-resolve to tor-resolve.py; stop installing it; move tor-resolve manpage to doc directory
svn:r2621
Diffstat (limited to 'contrib')
-rw-r--r--contrib/Makefile.am4
-rw-r--r--contrib/tor-resolve.117
-rwxr-xr-xcontrib/tor-resolve.py (renamed from contrib/tor-resolve)0
3 files changed, 2 insertions, 19 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index a073c9108..05491fe1e 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -4,6 +4,6 @@ EXTRA_DIST = tor-tsocks.conf torify.1 tor-resolve.1 tor.spec tor-resolve
conf_DATA = tor-tsocks.conf
-bin_SCRIPTS = torify tor-resolve
+bin_SCRIPTS = torify
-man_MANS = torify.1 tor-resolve.1
+man_MANS = torify.1
diff --git a/contrib/tor-resolve.1 b/contrib/tor-resolve.1
deleted file mode 100644
index 9c25f4475..000000000
--- a/contrib/tor-resolve.1
+++ /dev/null
@@ -1,17 +0,0 @@
-.TH tor-resolve 1 "" Aug-2004 ""
-.\" manual page by Peter Palfrader
-.SH NAME
-.LP
-tor-resolve \- resolve a hostname to an IP address via tor
-
-.SH SYNOPSIS
-\fBtor-resolve\fP\ [-4|-5] \fIhostname\fP\ [\fIsockshost\fP[:\fIsocksport]\fP]
-
-.SH DESCRIPTION
-\fBtor-resolve\fR 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.
-
-.SH SEE ALSO
-.BR tor (1),
-.BR torify (1).
diff --git a/contrib/tor-resolve b/contrib/tor-resolve.py
index 31b44af9d..31b44af9d 100755
--- a/contrib/tor-resolve
+++ b/contrib/tor-resolve.py