From ea7447b74a767227ad98b7cab11ce25ab4ded91d Mon Sep 17 00:00:00 2001
From: basil00 <basil@reqrypt.org>
Date: Mon, 5 Feb 2018 08:00:14 +0800
Subject: [PATCH] Towards 1.0 release.

- Fix timeouts (#7).
- Update version.
- Blacklist more MS "phone home" domains.
---
 Makefile   | 8 ++++----
 README.md  | 2 --
 build.sh   | 2 +-
 hosts.deny | 2 ++
 main.c     | 2 +-
 torrc      | 2 ++
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index e024b35..657f693 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 CC = i686-w64-mingw32-gcc
 WINDRES = i686-w64-mingw32-windres
-CFLAGS = --std=c99 -O2 -I contrib/WinDivert-1.4.0-rc-B-MINGW/include/ \
-    -mwindows -mthreads -mno-ms-bitfields -m32 -Wall
-CLIBS = -lws2_32 -lkernel32 -L contrib/WinDivert-1.4.0-rc-B-MINGW/x86/ \
-    -lWinDivert -lcomctl32 -mwindows
+CFLAGS = --std=c99 -O2 -I contrib/$(WINDIVERT)/include/ -mwindows -mthreads \
+    -mno-ms-bitfields -m32 -Wall -DVERSION=$(VERSION)
+CLIBS = -lws2_32 -lkernel32 -L contrib/$(WINDIVERT)/x86/ -lWinDivert \
+    -lcomctl32 -mwindows
 OBJS = main.o redirect.o domain.o
 PROG = tallow.exe
 
diff --git a/README.md b/README.md
index 70c7752..7a0dafd 100644
--- a/README.md
+++ b/README.md
@@ -107,8 +107,6 @@ TODOS
 Warnings
 ========
 
-Tallow is beta quality software.  There may be bugs.
-
 Currently Tallow makes no attempt to anonymize the content of traffic sent
 *through* the Tor network.  This information may be used to de-anonymize you.
 See [this
diff --git a/build.sh b/build.sh
index 4a19b66..9dbdbd6 100644
--- a/build.sh
+++ b/build.sh
@@ -50,7 +50,7 @@ unzip -o $TOR.zip
 
 echo "Building Tallow..."
 cd ..
-make
+make VERSION=$VERSION WINDIVERT=$WINDIVERT
 
 echo "Copying \"tallow.exe\"..."
 cp tallow.exe install/.
diff --git a/hosts.deny b/hosts.deny
index babe28d..a7d265c 100644
--- a/hosts.deny
+++ b/hosts.deny
@@ -16,6 +16,8 @@ spynet2.microsoft.com
 spynettest.microsoft.com
 sqm.microsoft.com
 watson.microsoft.com
+data.microsoft.com
+mp.microsoft.com
 msftncsi.com
 
 # Common ad servers:
diff --git a/main.c b/main.c
index 194ba47..f20cee1 100644
--- a/main.c
+++ b/main.c
@@ -319,7 +319,7 @@ int WINAPI WinMain(HINSTANCE instance, HINSTANCE prev_instance,
     }
 
     // (2) Create the window:
-    window = CreateWindow(PROGNAME "_WINDOW", PROGNAME " (beta)",
+    window = CreateWindow(PROGNAME "_WINDOW", PROGNAME " " STR(VERSION),
         WS_OVERLAPPEDWINDOW & (~WS_THICKFRAME),
         CW_USEDEFAULT, CW_USEDEFAULT, WINDOW_SIZE_X, WINDOW_SIZE_Y,
         NULL, NULL, instance, NULL);
diff --git a/torrc b/torrc
index 1a8ec01..dde247e 100644
--- a/torrc
+++ b/torrc
@@ -1,3 +1,5 @@
 # Tallow default torrc file.
 GeoIPFile "geoip"
 GeoIPv6File "geoip6"
+FascistFirewall 1
+FirewallPorts 9001,9030