diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-18 15:07:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-18 15:07:17 -0400 |
| commit | 617d71a63948cbd60fa68e592fdd875aa63832e1 (patch) | |
| tree | 2b128716f520589bc271022dd7c95f379e8eac33 /contrib | |
| parent | f15d9cf5db290f4e1c9ee80214674414238eabff (diff) | |
| parent | 7e9b6a19d4cdc605039f4e0107cbd5f4781fe150 (diff) | |
| download | tor-617d71a63948cbd60fa68e592fdd875aa63832e1.tar tor-617d71a63948cbd60fa68e592fdd875aa63832e1.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.4'
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 - |