diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/include.am | 3 | ||||
| -rw-r--r-- | contrib/tor-mingw.nsi.in | 2 | ||||
| -rw-r--r-- | contrib/tor-tsocks.conf | 13 |
3 files changed, 1 insertions, 17 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-mingw.nsi.in b/contrib/tor-mingw.nsi.in index c15a1a7c5..d5379bd57 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.9-alpha-dev" +!define VERSION "0.2.4.10-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" 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 - |