summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-11-09 01:34:18 +0000
committerRoger Dingledine <arma@torproject.org>2004-11-09 01:34:18 +0000
commit10ddf2b47fd2b36e50fdd82ca3079c0b9aaca46a (patch)
treefd6d7de250b029cd8b3136cb34c33e7acf40d6dc /contrib
parent8c7b2ff7eda913e8c09d5dfc7d522dd8725810bb (diff)
downloadtor-10ddf2b47fd2b36e50fdd82ca3079c0b9aaca46a.tar.gz
tor-10ddf2b47fd2b36e50fdd82ca3079c0b9aaca46a.zip
ship tor-control.py in the tarball
svn:r2713
Diffstat (limited to 'contrib')
-rw-r--r--contrib/Makefile.am4
-rwxr-xr-xcontrib/tor-control.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index e53f5d7399..278671d261 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,9 +1,9 @@
confdir = $(sysconfdir)/tor
-EXTRA_DIST = tor-tsocks.conf torify.1
+EXTRA_DIST = tor-tsocks.conf torify.1 tor-control.py
conf_DATA = tor-tsocks.conf
-bin_SCRIPTS = torify
+bin_SCRIPTS = torify tor-control.py
man_MANS = torify.1
diff --git a/contrib/tor-control.py b/contrib/tor-control.py
index d3efc78e8c..e11d98e1c9 100755
--- a/contrib/tor-control.py
+++ b/contrib/tor-control.py
@@ -10,7 +10,7 @@ MSG_TYPE_GETCONF = 0x0003
MSG_TYPE_AUTH = 0x0007
def parseHostAndPort(h):
- host, port = "localhost", 9050
+ host, port = "localhost", 9051
if ":" in h:
i = h.index(":")
host = h[:i]