Update to latest WinDivert & Tor.

basil00 · Oct 22, 2017 · ce37028 · ce37028
1 parent 1e88781
commit ce37028
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,8 @@
 CC = i686-w64-mingw32-gcc
 WINDRES = i686-w64-mingw32-windres
-CFLAGS = --std=c99 -O2 -I contrib/WinDivert-1.2.0-rc-MINGW/include/ -mwindows \
+CFLAGS = --std=c99 -O2 -I contrib/WinDivert-1.3.0-MINGW/include/ -mwindows \
     -mthreads -mno-ms-bitfields -m32 -Wall
-CLIBS = -lws2_32 -lkernel32 -L contrib/WinDivert-1.2.0-rc-MINGW/x86/ \
+CLIBS = -lws2_32 -lkernel32 -L contrib/WinDivert-1.3.0-MINGW/x86/ \
     -lWinDivert -lcomctl32 -mwindows
 OBJS = main.o redirect.o domain.o
 PROG = tallow.exe

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-Tallow (formally TorWall) - Transparent Tor for Windows
-=======================================================
+Tallow - Transparent Tor for Windows
+====================================
 
 Tallow is a small program that redirects all outbound traffic from a Windows
 machine via the Tor anonymity network.  Any traffic that cannot be handled by
@@ -89,8 +89,8 @@ To build Tallow you need the MinGW cross-compiler for Linux.
 You also need to download and place the following external dependencies and
 place them in the contrib/ directory:
 
-* [WinDivert-1.2.0-rc-MINGW.zip](http://reqrypt.org/windivert.html).
-* [tor-win32-0.2.6.9.zip](https://www.torproject.org/).
+* [WinDivert-1.3.0-MINGW.zip](http://reqrypt.org/windivert.html).
+* [tor-win32-0.3.1.7.zip](https://www.torproject.org/).
 
 Then simply run the build.sh script.
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.5-beta
+0.6-beta
diff --git a/build.sh b/build.sh
@@ -20,8 +20,8 @@
 
 set -e
 
-WINDIVERT=WinDivert-1.2.0-rc-MINGW
-TOR=tor-win32-0.2.6.9
+WINDIVERT=WinDivert-1.3.0-MINGW
+TOR=tor-win32-0.3.1.7
 VERSION=`cat VERSION`
 
 echo "Checking for dependencies..."

diff --git a/main.c b/main.c
@@ -413,7 +413,7 @@ static DWORD WINAPI tor_thread(LPVOID arg)
     // NOTE: Tor warns about allowing external connections.  However, such
     //       connections are blocked (see redirect_init).
     if (!CreateProcess(tor_path,
-        "tor.exe --SOCKSListenAddress 0.0.0.0:" STR(TOR_PORT) " -f .\\torrc",
+        "tor.exe --SocksPort 0.0.0.0:" STR(TOR_PORT) " -f .\\torrc",
         NULL, NULL, TRUE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi))
     {
         warning("failed to start Tor");