aboutsummaryrefslogtreecommitdiff
path: root/contrib/include.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-02-27 19:38:32 -0500
committerNick Mathewson <nickm@torproject.org>2013-02-27 19:39:57 -0500
commit4740d2e8bcf72cc92bae72762ccae904015b9b2f (patch)
treed5b606d5dbfad83ae68419811480fd61fb07b656 /contrib/include.am
parent9bc05c30d7b035766e89209e1075ee1bc66ccd4e (diff)
downloadtor-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/include.am')
-rw-r--r--contrib/include.am3
1 files changed, 0 insertions, 3 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