diff options
| author | Roger Dingledine <arma@torproject.org> | 2013-04-11 01:29:24 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2013-04-11 01:29:24 -0400 |
| commit | 887eba98950f2974bd2031510e1ece2279a4f106 (patch) | |
| tree | 0bda88092333a1aa21925033596f395df4e3d4b1 /contrib | |
| parent | fcd9248387249d68619734a73860ffaab12b021b (diff) | |
| parent | 6acf0ac2851fb95953edea9c231d82f487f28c3d (diff) | |
| download | tor-887eba98950f2974bd2031510e1ece2279a4f106.tar.gz tor-887eba98950f2974bd2031510e1ece2279a4f106.zip | |
Merge branch 'maint-0.2.4' into release-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 4a995a37d2..6d7fb16f9a 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 3dddaddbce..0000000000 --- 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 - |