diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-02-27 19:38:32 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-02-27 19:39:57 -0500 |
| commit | 4740d2e8bcf72cc92bae72762ccae904015b9b2f (patch) | |
| tree | d5b606d5dbfad83ae68419811480fd61fb07b656 /doc | |
| parent | 9bc05c30d7b035766e89209e1075ee1bc66ccd4e (diff) | |
| download | tor-4740d2e8bcf72cc92bae72762ccae904015b9b2f.tar tor-4740d2e8bcf72cc92bae72762ccae904015b9b2f.tar.gz | |
Remove some lingering tsocks cruft.
Now the manpages no longer refer to tsocks or tsocks.conf, and we no
longer have or ship a tor-tsocks.conf. The only remaining instances
of "tsocks" in our repository are old ChangeLog and ReleaseNotes
entries, and the torify script saying that it doesn't support tsocks.
Fixes bug 8290.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 2 | ||||
| -rw-r--r-- | doc/torify.1.txt | 18 |
2 files changed, 4 insertions, 16 deletions
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 ------- |