aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug82909
-rw-r--r--contrib/include.am3
-rw-r--r--contrib/tor-tsocks.conf13
-rw-r--r--doc/tor.1.txt2
-rw-r--r--doc/torify.1.txt18
5 files changed, 13 insertions, 32 deletions
diff --git a/changes/bug8290 b/changes/bug8290
new file mode 100644
index 000000000..d1fce7d8b
--- /dev/null
+++ b/changes/bug8290
@@ -0,0 +1,9 @@
+ o Removed files:
+ - The tor-tsocks.conf is no longer distributed or installed. We
+ recommend that tsocks users use torsocks instead. Resolves
+ ticket 8290.
+
+ o Documentation fixes:
+ - The torify manpage no longer refers to tsocks; torify hasn't
+ supported tsocks since 0.2.3.14-alpha.
+ - The manpages no longer reference tsocks.
diff --git a/contrib/include.am b/contrib/include.am
index 4a995a37d..6d7fb16f9 100644
--- a/contrib/include.am
+++ b/contrib/include.am
@@ -9,12 +9,9 @@ EXTRA_DIST+= \
contrib/tor-ctrl.sh \
contrib/tor-exit-notice.html \
contrib/tor-mingw.nsi.in \
- contrib/tor-tsocks.conf \
contrib/tor.ico \
contrib/tor.nsi.in \
contrib/tor.sh \
contrib/torctl
-conf_DATA+= contrib/tor-tsocks.conf
-
bin_SCRIPTS+= contrib/torify
diff --git a/contrib/tor-tsocks.conf b/contrib/tor-tsocks.conf
deleted file mode 100644
index 3dddaddbc..000000000
--- a/contrib/tor-tsocks.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# This is the configuration for libtsocks (transparent socks) for use
-# with tor, which is providing a socks server on port 9050 by default.
-#
-# See tsocks.conf(5) and torify(1) manpages.
-
-server = 127.0.0.1
-server_port = 9050
-
-# We specify local as 127.0.0.0 - 127.191.255.255 because the
-# Tor MAPADDRESS virtual IP range is the rest of net 127.
-local = 127.0.0.0/255.128.0.0
-local = 127.128.0.0/255.192.0.0
-
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 75bca7937..b598a54a1 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2134,7 +2134,7 @@ __HiddenServiceDirectory__**/client_keys**::
SEE ALSO
--------
-**privoxy**(1), **tsocks**(1), **torify**(1) +
+**privoxy**(1), **torsocks**(1), **torify**(1) +
**https://www.torproject.org/**
diff --git a/doc/torify.1.txt b/doc/torify.1.txt
index 22b3fe537..8dca90131 100644
--- a/doc/torify.1.txt
+++ b/doc/torify.1.txt
@@ -9,7 +9,7 @@ torify(1)
NAME
----
-torify - wrapper for torsocks or tsocks and tor
+torify - wrapper for torsocks and tor
SYNOPSIS
--------
@@ -18,36 +18,24 @@ SYNOPSIS
DESCRIPTION
-----------
**torify** is a simple wrapper that attempts to find the best underlying Tor
-wrapper available on a system. It calls torsocks or tsocks with a tor specific
+wrapper available on a system. It calls torsocks with a tor specific
configuration file. +
torsocks is an improved wrapper that explicitly rejects UDP, safely resolves DNS
lookups and properly socksifies your TCP connections. +
-tsocks itself is a wrapper between the tsocks library and the application that
-you would like to run socksified. +
-
Please note that since both method use LD_PRELOAD, torify cannot be applied to
suid binaries.
WARNING
-------
-You should also be aware that the way tsocks currently works only TCP
-connections are socksified. Be aware that this will in most circumstances not
-include hostname lookups which would still be routed through your normal system
-resolver to your usual resolving nameservers. The **tor-resolve**(1) tool can be
-useful as a workaround in some cases. The Tor FAQ at
-https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ might have further
-information on this subject. +
-
When used with torsocks, torify should not leak DNS requests or UDP data. +
Both will leak ICMP data.
SEE ALSO
--------
-**tor**(1), **tor-resolve**(1), **torsocks**(1), **tsocks**(1),
-**tsocks.conf**(5).
+**tor**(1), **tor-resolve**(1), **torsocks**(1)
AUTHORS
-------