From 75c13bbb6d9602307fdda7b9b295906956965f59 Mon Sep 17 00:00:00 2001
From: basil00 <basil@reqrypt.org>
Date: Sat, 26 Oct 2019 08:20:03 +0800
Subject: [PATCH] Update to latest WinDivert and Tor

---
 build.sh    | 15 ++++++++-------
 install.nsi | 11 ++++++-----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/build.sh b/build.sh
index 9b1fbad..ad7d74d 100644
--- a/build.sh
+++ b/build.sh
@@ -20,8 +20,8 @@
 
 set -e
 
-WINDIVERT=WinDivert-2.0.0-rc
-TOR=tor-win32-0.3.5.7
+WINDIVERT=WinDivert-2.2.0-B
+TOR=tor-win32-0.4.1.6
 VERSION=`cat VERSION`
 
 echo "Checking for dependencies..."
@@ -69,13 +69,14 @@ for FILE in \
        "$WINDIVERT/x64/WinDivert64.sys" \
        "$WINDIVERT/x86/WinDivert32.sys" \
        "$WINDIVERT/x86/WinDivert.dll" \
-       "Tor/libeay32.dll" \
-       "Tor/libevent-2-0-5.dll" \
-       "Tor/libevent_core-2-0-5.dll" \
-       "Tor/libevent_extra-2-0-5.dll" \
+       "Tor/libcrypto-1_1.dll" \
+       "Tor/libssl-1_1.dll" \
+       "Tor/libwinpthread-1.dll" \
+       "Tor/libevent-2-1-6.dll" \
+       "Tor/libevent_core-2-1-6.dll" \
+       "Tor/libevent_extra-2-1-6.dll" \
        "Tor/libgcc_s_sjlj-1.dll" \
        "Tor/libssp-0.dll" \
-       "Tor/ssleay32.dll" \
        "Tor/zlib1.dll" \
        "Tor/tor.exe" \
        "Data/Tor/geoip" \
diff --git a/install.nsi b/install.nsi
index b065ac6..15c212a 100644
--- a/install.nsi
+++ b/install.nsi
@@ -49,13 +49,14 @@ Section ""
     File "WinDivert.dll"
 
     ; Tor files:
-    File "libeay32.dll"
-    File "libevent-2-0-5.dll"
-    File "libevent_core-2-0-5.dll"
-    File "libevent_extra-2-0-5.dll"
+    File "libcrypto-1_1.dll"
+    File "libssl-1_1.dll"
+    File "libwinpthread-1.dll"
+    File "libevent-2-1-6.dll"
+    File "libevent_core-2-1-6.dll"
+    File "libevent_extra-2-1-6.dll"
     File "libgcc_s_sjlj-1.dll"
     File "libssp-0.dll"
-    File "ssleay32.dll"
     File "zlib1.dll"
     File "tor.exe"
     File "geoip"