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 /contrib | |
| 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 'contrib')
| -rw-r--r-- | contrib/include.am | 3 | ||||
| -rw-r--r-- | contrib/tor-tsocks.conf | 13 |
2 files changed, 0 insertions, 16 deletions
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 - |