Merge remote-tracking branch 'origin/maint-0.2.4'

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.

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

contrib/tor-tsocks.conf

@@ -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
-

doc/tor.1.txt

@@ -2139,7 +2139,7 @@ __HiddenServiceDirectory__**/client_keys**::
 
 SEE ALSO
 --------
-**privoxy**(1), **tsocks**(1), **torify**(1) +
+**privoxy**(1), **torsocks**(1), **torify**(1) +
 
 **https://www.torproject.org/**
 

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),
+**tor**(1), **tor-resolve**(1), **torsocks**(1)
-**tsocks.conf**(5).
 
 AUTHORS
 -------