ship tor-control.py in the tarball

svn:r2713

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index e53f5d7399f50d3bf3b119605cd61451a4027f4e..278671d2619e073b0cabff681fd453d9374e0bba 100644 (file)
--- 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 d3efc78e8cccbafba41844ef58ef6f816217dd3e..e11d98e1c9fe75081de00e06487206eedc834bb3 100755 (executable)
--- 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]