Updated dependencies. Properly closes TLS connections.

.gitignore

@@ -1,20 +1,22 @@
-OpenSSL_1_1_1u.zip
-openssl-OpenSSL_1_1_1u
+openssl-3.1.3.tar.gz
+openssl-3.1.3
 openssl
-release-2.1.12-stable.zip
-libevent-release-2.1.12-stable
+libevent-2.2.1-alpha-dev.tar.gz
+libevent-2.2.1-alpha-dev
 libevent
-v1.2.13.zip
-zlib-1.2.13
+zlib-1.3.tar.gz
+zlib-1.3
 zlib
-tor-0.4.7.13.zip
-tor-tor-0.4.7.13
+tor-tor-0.4.8.7.zip
+tor-tor-0.4.8.7
 tor
 autoconf-2.71.tar.gz
 autoconf-2.71
 automake-1.16.5.tar.gz
 automake-1.16.5
 libtool-2.4.7.tar.gz
 libtool-2.4.7
+pkg-config-0.29.2.tar.gz
+pkg-config-0.29.2
 Tor Proxy
 Tor Proxy.exe

Makefile.Linux

@@ -1,9 +1,9 @@
 # Program parameters
 NAME = "Tor Proxy"
-VERSION = "1.0.5"
+VERSION = "1.0.6"
 CC = "g++"
 STRIP = "strip"
-CFLAGS = -I "./openssl/dist/include" -I "./libevent" -I "./libevent/dist/include" -I "./tor" -I "./tor/src" -static-libstdc++ -static-libgcc -O3 -Wall -std=c++17 -finput-charset=UTF-8 -fexec-charset=UTF-8 -funsigned-char -ffunction-sections -fdata-sections -D PROGRAM_NAME=$(NAME) -D PROGRAM_VERSION=$(VERSION)
+CFLAGS = -I "./openssl/dist/include" -I "./libevent" -I "./libevent/dist/include" -I "./tor" -I "./tor/src" -static-libstdc++ -static-libgcc -O3 -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -std=c++17 -finput-charset=UTF-8 -fexec-charset=UTF-8 -funsigned-char -ffunction-sections -fdata-sections -D PROGRAM_NAME=$(NAME) -D PROGRAM_VERSION=$(VERSION)
 LIBS = -L "./openssl/dist/lib" -L "./libevent/dist/lib" -L "./zlib/dist/lib" -L "./tor" -Wl,-Bstatic -ltor -levent -levent_openssl -levent_pthreads -lssl -lcrypto -lz -Wl,-Bdynamic -lpthread
 SRCS = "./main.cpp"
 PROGRAM_NAME = $(subst $\",,$(NAME))
@@ -12,10 +12,10 @@ PROGRAM_NAME = $(subst $\",,$(NAME))
 all:
 	$(CC) $(CFLAGS) -o "./$(PROGRAM_NAME)" $(SRCS) $(LIBS)
 	$(STRIP) "./$(PROGRAM_NAME)"
-	
+
 # Make clean
 clean:
-	rm -rf "./$(PROGRAM_NAME)" "./OpenSSL_1_1_1u.zip" "./openssl-OpenSSL_1_1_1u" "./openssl" "./release-2.1.12-stable.zip" "./libevent-release-2.1.12-stable" "./libevent" "./v1.2.13.zip" "./zlib-1.2.13" "./zlib" "./tor-0.4.7.13.zip" "./tor-tor-0.4.7.13" "./tor"
+	rm -rf "./$(PROGRAM_NAME)" "./openssl-3.1.3.tar.gz" "./openssl-3.1.3" "./openssl" "./libevent-2.2.1-alpha-dev.tar.gz" "./libevent-2.2.1-alpha-dev" "./libevent" "./zlib-1.3.tar.gz" "./zlib-1.3" "./zlib" "./tor-tor-0.4.8.7.zip" "./tor-tor-0.4.8.7" "./tor"
 
 # Make run
 run:
@@ -25,29 +25,29 @@ run:
 dependencies:
 
 	# OpenSSL
-	wget "https://github.com/openssl/openssl/archive/refs/tags/OpenSSL_1_1_1u.zip"
-	unzip "./OpenSSL_1_1_1u.zip"
-	rm "./OpenSSL_1_1_1u.zip"
-	mv "./openssl-OpenSSL_1_1_1u" "./openssl"
-	cd "./openssl" && "./config" --prefix="$(CURDIR)/openssl/dist" --openssldir=$(shell openssl version -d | awk '{print $$2}') no-shared no-asm no-dso && sed -i "s/INSTALLTOP=.*$$/INSTALLTOP=.\/dist/" "./Makefile" && make && make install || true
+	wget "https://github.com/openssl/openssl/releases/download/openssl-3.1.3/openssl-3.1.3.tar.gz"
+	tar -xf "./openssl-3.1.3.tar.gz"
+	rm "./openssl-3.1.3.tar.gz"
+	mv "./openssl-3.1.3" "./openssl"
+	cd "./openssl" && "./config" --prefix="$(CURDIR)/openssl/dist" --openssldir=$(shell openssl version -d | awk '{print $$2}') --libdir=lib --release no-shared && make && make install || true
 
 	# Libevent
-	wget "https://github.com/libevent/libevent/archive/refs/tags/release-2.1.12-stable.zip"
-	unzip "./release-2.1.12-stable.zip"
-	rm "./release-2.1.12-stable.zip"
-	mv "./libevent-release-2.1.12-stable" "./libevent"
-	cd "./libevent" && "./autogen.sh" && "./configure" --prefix="$(CURDIR)/libevent/dist" --disable-shared --enable-static --with-pic --disable-samples --disable-libevent-regress CPPFLAGS="-I../openssl/dist/include" LDFLAGS="-L../openssl/dist/lib" && make && make install
+	wget "https://github.com/libevent/libevent/releases/download/release-2.2.1-alpha/libevent-2.2.1-alpha-dev.tar.gz"
+	tar -xf "./libevent-2.2.1-alpha-dev.tar.gz"
+	rm "./libevent-2.2.1-alpha-dev.tar.gz"
+	mv "./libevent-2.2.1-alpha-dev" "./libevent"
+	cd "./libevent" && "./autogen.sh" && "./configure" --prefix="$(CURDIR)/libevent/dist" --disable-debug-mode --disable-shared CPPFLAGS="-I../openssl/dist/include" LDFLAGS="-L../openssl/dist/lib" && make && make install
 
 	# Zlib
-	wget "https://github.com/madler/zlib/archive/refs/tags/v1.2.13.zip"
-	unzip "./v1.2.13.zip"
-	rm "./v1.2.13.zip"
-	mv "./zlib-1.2.13" "./zlib"
-	cd "./zlib" && "./configure" --prefix="$(CURDIR)/zlib/dist" && make && make install
+	wget "https://github.com/madler/zlib/releases/download/v1.3/zlib-1.3.tar.gz"
+	tar -xf "./zlib-1.3.tar.gz"
+	rm "./zlib-1.3.tar.gz"
+	mv "./zlib-1.3" "./zlib"
+	cd "./zlib" && "./configure" --prefix="$(CURDIR)/zlib/dist" --static && make && make install
 
 	# Tor
-	wget "https://github.com/torproject/tor/archive/refs/tags/tor-0.4.7.13.zip";
-	unzip "./tor-0.4.7.13.zip"
-	rm "./tor-0.4.7.13.zip"
-	mv "./tor-tor-0.4.7.13" "./tor"
-	cd "tor" && "./autogen.sh" && "./configure" --disable-gcc-hardening --disable-linker-hardening --disable-module-relay --disable-module-dirauth --enable-static-openssl --with-openssl-dir="$(CURDIR)/openssl/dist" --enable-static-libevent --with-libevent-dir="$(CURDIR)/libevent/dist" --enable-static-zlib --with-zlib-dir="$(CURDIR)/zlib/dist" --disable-asciidoc --disable-system-torrc --disable-nss --disable-systemd --disable-lzma --disable-zstd --disable-seccomp --disable-libscrypt --disable-unittests && make
+	wget "https://gitlab.torproject.org/tpo/core/tor/-/archive/tor-0.4.8.7/tor-tor-0.4.8.7.zip"
+	unzip "./tor-tor-0.4.8.7.zip"
+	rm "./tor-tor-0.4.8.7.zip"
+	mv "./tor-tor-0.4.8.7" "./tor"
+	cd "./tor" && "./autogen.sh" && "./configure" --enable-static-openssl --with-openssl-dir="$(CURDIR)/openssl/dist" --enable-static-libevent --with-libevent-dir="$(CURDIR)/libevent/dist" --enable-static-zlib --with-zlib-dir="$(CURDIR)/zlib/dist" --disable-module-relay --disable-module-dirauth --disable-asciidoc --disable-system-torrc --disable-nss --disable-systemd --disable-lzma --disable-zstd --disable-seccomp --disable-libscrypt && make

Makefile.Windows

@@ -1,21 +1,21 @@
 # Program parameters
 NAME = "Tor Proxy"
-VERSION = "1.0.5"
+VERSION = "1.0.6"
 CC = "x86_64-w64-mingw32-g++-posix"
 STRIP = "x86_64-w64-mingw32-strip"
-CFLAGS = -I "./openssl/dist/include" -I "./libevent" -I "./libevent/compat" -I "./libevent/dist/include" -I "./tor" -I "./tor/src" -static-libstdc++ -static-libgcc -O3 -Wall -std=c++17 -finput-charset=UTF-8 -fexec-charset=UTF-8 -funsigned-char -ffunction-sections -fdata-sections -D PROGRAM_NAME=$(NAME) -D PROGRAM_VERSION=$(VERSION)
-LIBS = -L "./openssl/dist/lib" -L "./libevent/dist/lib" -L "./zlib/dist/lib" -L "./tor" -Wl,-Bstatic -ltor -levent -levent_openssl -lssl -lcrypto -lz -lpthread -Wl,-Bdynamic -lcrypt32 -lws2_32 -liphlpapi -lshlwapi
+CFLAGS = -I "./openssl/dist/include" -I "./libevent" -I "./libevent/compat" -I "./libevent/dist/include" -I "./tor" -I "./tor/src" -static-libstdc++ -static-libgcc -O3 -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -std=c++17 -finput-charset=UTF-8 -fexec-charset=UTF-8 -funsigned-char -ffunction-sections -fdata-sections -D PROGRAM_NAME=$(NAME) -D PROGRAM_VERSION=$(VERSION)
+LIBS = -L "./openssl/dist/lib" -L "./libevent/dist/lib" -L "./zlib/dist/lib" -L "./tor" -Wl,-Bstatic -ltor -levent -levent_openssl -lssl -lcrypto -lz -lpthread -Wl,-Bdynamic -lcrypt32 -lws2_32 -liphlpapi -lshlwapi -lbcrypt
 SRCS = "./main.cpp"
 PROGRAM_NAME = $(subst $\",,$(NAME))
 
 # Make
 all:
 	$(CC) $(CFLAGS) -o "./$(PROGRAM_NAME).exe" $(SRCS) $(LIBS)
 	$(STRIP) "./$(PROGRAM_NAME).exe"
-	
+
 # Make clean
 clean:
-	rm -rf "./$(PROGRAM_NAME).exe" "./OpenSSL_1_1_1u.zip" "./openssl-OpenSSL_1_1_1u" "./openssl" "./release-2.1.12-stable.zip" "./libevent-release-2.1.12-stable" "./libevent" "./v1.2.13.zip" "./zlib-1.2.13" "./zlib" "./tor-0.4.7.13.zip" "./tor-tor-0.4.7.13" "./tor"
+	rm -rf "./$(PROGRAM_NAME).exe" "./openssl-3.1.3.tar.gz" "./openssl-3.1.3" "./openssl" "./libevent-2.2.1-alpha-dev.tar.gz" "./libevent-2.2.1-alpha-dev" "./libevent" "./zlib-1.3.tar.gz" "./zlib-1.3" "./zlib" "./tor-tor-0.4.8.7.zip" "./tor-tor-0.4.8.7" "./tor"
 
 # Make run
 run:
@@ -25,29 +25,29 @@ run:
 dependencies:
 
 	# OpenSSL
-	wget "https://github.com/openssl/openssl/archive/refs/tags/OpenSSL_1_1_1u.zip"
-	unzip "./OpenSSL_1_1_1u.zip"
-	rm "./OpenSSL_1_1_1u.zip"
-	mv "./openssl-OpenSSL_1_1_1u" "./openssl"
-	cd "./openssl" && "./Configure" mingw64 --prefix="$(CURDIR)/openssl/dist" --cross-compile-prefix=x86_64-w64-mingw32- no-shared no-asm no-dso CC=gcc-posix && sed -i "s/INSTALLTOP=.*$$/INSTALLTOP=.\/dist/" "./Makefile" && sed -i "s/INSTALLTOP_dir=.*$$/INSTALLTOP_dir=.\/dist/" "./Makefile" && sed -i "s/ENGINESDIR_dir=.*$$/ENGINESDIR_dir=.\/dist\/lib\/engines-1_1/" "./Makefile" && make && make install
+	wget "https://github.com/openssl/openssl/releases/download/openssl-3.1.3/openssl-3.1.3.tar.gz"
+	tar -xf "./openssl-3.1.3.tar.gz"
+	rm "./openssl-3.1.3.tar.gz"
+	mv "./openssl-3.1.3" "./openssl"
+	cd "./openssl" && "./Configure" --prefix="$(CURDIR)/openssl/dist" --libdir=lib --release no-shared mingw64 --cross-compile-prefix=x86_64-w64-mingw32- && make && make install
 
 	# Libevent
-	wget "https://github.com/libevent/libevent/archive/refs/tags/release-2.1.12-stable.zip"
-	unzip "./release-2.1.12-stable.zip"
-	rm "./release-2.1.12-stable.zip"
-	mv "./libevent-release-2.1.12-stable" "./libevent"
-	cd "./libevent" && "./autogen.sh" && "./configure" --prefix="$(CURDIR)/libevent/dist" --host=x86_64-w64-mingw32 --disable-shared --enable-static --with-pic --disable-samples --disable-libevent-regress CC=x86_64-w64-mingw32-gcc-posix CPPFLAGS="-I../openssl/dist/include" LDFLAGS="-L../openssl/dist/lib" && make && make install
+	wget "https://github.com/libevent/libevent/releases/download/release-2.2.1-alpha/libevent-2.2.1-alpha-dev.tar.gz"
+	tar -xf "./libevent-2.2.1-alpha-dev.tar.gz"
+	rm "./libevent-2.2.1-alpha-dev.tar.gz"
+	mv "./libevent-2.2.1-alpha-dev" "./libevent"
+	cd "./libevent" && "./autogen.sh" && "./configure" --prefix="$(CURDIR)/libevent/dist" --disable-debug-mode --disable-shared CPPFLAGS="-I../openssl/dist/include" LDFLAGS="-L../openssl/dist/lib" --host=x86_64-w64-mingw32 CC=x86_64-w64-mingw32-gcc-posix --disable-samples --disable-libevent-regress && make && make install
 
 	# Zlib
-	wget "https://github.com/madler/zlib/archive/refs/tags/v1.2.13.zip"
-	unzip "./v1.2.13.zip"
-	rm "./v1.2.13.zip"
-	mv "./zlib-1.2.13" "./zlib"
+	wget "https://github.com/madler/zlib/releases/download/v1.3/zlib-1.3.tar.gz"
+	tar -xf "./zlib-1.3.tar.gz"
+	rm "./zlib-1.3.tar.gz"
+	mv "./zlib-1.3" "./zlib"
 	cd "./zlib" && sed -i "s/PREFIX =/PREFIX = x86_64-w64-mingw32-\nBINARY_PATH = .\/dist\/bin\nINCLUDE_PATH = .\/dist\/include\nLIBRARY_PATH = .\/dist\/lib/" "./win32/Makefile.gcc" && make -f "./win32/Makefile.gcc" && sed -i "s/$$(PREFIX)gcc/\$$(PREFIX)gcc-posix/" "./win32/Makefile.gcc" && make -f "./win32/Makefile.gcc" install
 
 	# Tor
-	wget "https://github.com/torproject/tor/archive/refs/tags/tor-0.4.7.13.zip";
-	unzip "./tor-0.4.7.13.zip"
-	rm "./tor-0.4.7.13.zip"
-	mv "./tor-tor-0.4.7.13" "./tor"
-	cd "tor" && "./autogen.sh" && "./configure" --disable-gcc-hardening --disable-linker-hardening --disable-module-relay --disable-module-dirauth --disable-tool-name-check --host=x86_64-w64-mingw32 --enable-static-openssl --with-openssl-dir="$(CURDIR)/openssl/dist" --enable-static-libevent --with-libevent-dir="$(CURDIR)/libevent/dist" --enable-static-zlib --with-zlib-dir="$(CURDIR)/zlib/dist" --disable-asciidoc --disable-system-torrc --disable-nss --disable-systemd --disable-lzma --disable-zstd --disable-seccomp --disable-libscrypt --disable-unittests CC=x86_64-w64-mingw32-gcc-posix && make
+	wget "https://gitlab.torproject.org/tpo/core/tor/-/archive/tor-0.4.8.7/tor-tor-0.4.8.7.zip"
+	unzip "./tor-tor-0.4.8.7.zip"
+	rm "./tor-tor-0.4.8.7.zip"
+	mv "./tor-tor-0.4.8.7" "./tor"
+	cd "tor" && "./autogen.sh" && "./configure" --enable-static-openssl --with-openssl-dir="$(CURDIR)/openssl/dist" --enable-static-libevent --with-libevent-dir="$(CURDIR)/libevent/dist" --enable-static-zlib --with-zlib-dir="$(CURDIR)/zlib/dist" --disable-module-relay --disable-module-dirauth --disable-asciidoc --disable-system-torrc --disable-nss --disable-systemd --disable-lzma --disable-zstd --disable-seccomp --disable-libscrypt --host=x86_64-w64-mingw32 CC=x86_64-w64-mingw32-gcc-posix --disable-tool-name-check --disable-gcc-hardening && make

Makefile.macOS

@@ -1,9 +1,9 @@
 # Program parameters
 NAME = "Tor Proxy"
-VERSION = "1.0.5"
+VERSION = "1.0.6"
 CC = "g++"
 STRIP = "strip"
-CFLAGS = -I "./openssl/dist/include" -I "./libevent" -I "./libevent/dist/include" -I "./tor" -I "./tor/src" -O3 -Wall -std=c++17 -finput-charset=UTF-8 -fexec-charset=UTF-8 -funsigned-char -ffunction-sections -fdata-sections -D PROGRAM_NAME=$(NAME) -D PROGRAM_VERSION=$(VERSION)
+CFLAGS = -I "./openssl/dist/include" -I "./libevent" -I "./libevent/dist/include" -I "./tor" -I "./tor/src" -O3 -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -std=c++17 -finput-charset=UTF-8 -fexec-charset=UTF-8 -funsigned-char -ffunction-sections -fdata-sections -D PROGRAM_NAME=$(NAME) -D PROGRAM_VERSION=$(VERSION)
 LIBS = -L "./openssl/dist/lib" -L "./libevent/dist/lib" -L "./zlib/dist/lib" -L "./tor" -ltor -levent -levent_openssl -levent_pthreads -lssl -lcrypto "./zlib/dist/lib/libz.a" -lpthread
 SRCS = "./main.cpp"
 PROGRAM_NAME = $(subst $\",,$(NAME))
@@ -12,10 +12,10 @@ PROGRAM_NAME = $(subst $\",,$(NAME))
 all:
 	$(CC) $(CFLAGS) -o "./$(PROGRAM_NAME)" $(SRCS) $(LIBS)
 	$(STRIP) "./$(PROGRAM_NAME)"
-	
+
 # Make clean
 clean:
-	rm -rf "./$(PROGRAM_NAME)" "./OpenSSL_1_1_1u.zip" "./openssl-OpenSSL_1_1_1u" "./openssl" "./autoconf-2.71.tar.gz" "./autoconf-2.71" "./automake-1.16.5.tar.gz" "./automake-1.16.5" "./libtool-2.4.7.tar.gz" "./libtool-2.4.7" "./release-2.1.12-stable.zip" "./libevent-release-2.1.12-stable" "./libevent" "./v1.2.13.zip" "./zlib-1.2.13" "./zlib" "./tor-0.4.7.13.zip" "./tor-tor-0.4.7.13" "./tor"
+	rm -rf "./$(PROGRAM_NAME)" "./openssl-3.1.3.tar.gz" "./openssl-3.1.3" "./openssl" "./libevent-2.2.1-alpha-dev.tar.gz" "./libevent-2.2.1-alpha-dev" "./libevent" "./zlib-1.3.tar.gz" "./zlib-1.3" "./zlib" "./tor-tor-0.4.8.7.zip" "./tor-tor-0.4.8.7" "./tor" "./autoconf-2.71.tar.gz" "./autoconf-2.71" "./automake-1.16.5.tar.gz" "./automake-1.16.5" "./libtool-2.4.7.tar.gz" "./libtool-2.4.7" "./pkg-config-0.29.2.tar.gz" "./pkg-config-0.29.2"
 
 # Make run
 run:
@@ -25,11 +25,11 @@ run:
 dependencies:
 
 	# OpenSSL
-	curl -f -LOk "https://github.com/openssl/openssl/archive/refs/tags/OpenSSL_1_1_1u.zip"
-	unzip "./OpenSSL_1_1_1u.zip"
-	rm "./OpenSSL_1_1_1u.zip"
-	mv "./openssl-OpenSSL_1_1_1u" "./openssl"
-	cd "./openssl" && "./Configure" darwin64-x86_64-cc --prefix="$(CURDIR)/openssl/dist" --openssldir="/etc/ssl" no-shared no-asm no-dso && sed -i "" -e "s/INSTALLTOP=.*$$/INSTALLTOP=.\/dist/" "./Makefile" && make && make install || true
+	curl -f -LOk "https://github.com/openssl/openssl/releases/download/openssl-3.1.3/openssl-3.1.3.tar.gz"
+	tar -xf "./openssl-3.1.3.tar.gz"
+	rm "./openssl-3.1.3.tar.gz"
+	mv "./openssl-3.1.3" "./openssl"
+	cd "./openssl" && "./Configure" --prefix="$(CURDIR)/openssl/dist" --openssldir="/etc/ssl" --libdir=lib --release no-shared darwin64-x86_64-cc && make && make install || true
 
 	# Libevent
 	curl -f -LOk "https://ftp.gnu.org/gnu/autoconf/autoconf-2.71.tar.gz"
@@ -47,22 +47,27 @@ dependencies:
 	rm "./libtool-2.4.7.tar.gz"
 	cd "./libtool-2.4.7" && "./configure" && make && sudo make install
 	sudo rm -r "./libtool-2.4.7"
-	curl -f -LOk "https://github.com/libevent/libevent/archive/refs/tags/release-2.1.12-stable.zip"
-	unzip "./release-2.1.12-stable.zip"
-	rm "./release-2.1.12-stable.zip"
-	mv "./libevent-release-2.1.12-stable" "./libevent"
-	cd "./libevent" && "./autogen.sh" && "./configure" --prefix="$(CURDIR)/libevent/dist" --disable-shared --enable-static --with-pic --disable-samples --disable-libevent-regress CPPFLAGS="-I../openssl/dist/include" LDFLAGS="-L../openssl/dist/lib" && make && make install
+	curl -f -LOk "https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz"
+	tar -xf "./pkg-config-0.29.2.tar.gz"
+	rm "./pkg-config-0.29.2.tar.gz"
+	cd "./pkg-config-0.29.2" && "./configure" --with-internal-glib && make && sudo make install
+	sudo rm -r "./pkg-config-0.29.2"
+	curl -f -LOk "https://github.com/libevent/libevent/releases/download/release-2.2.1-alpha/libevent-2.2.1-alpha-dev.tar.gz"
+	tar -xf "./libevent-2.2.1-alpha-dev.tar.gz"
+	rm "./libevent-2.2.1-alpha-dev.tar.gz"
+	mv "./libevent-2.2.1-alpha-dev" "./libevent"
+	cd "./libevent" && "./autogen.sh" && "./configure" --prefix="$(CURDIR)/libevent/dist" --disable-debug-mode --disable-shared CPPFLAGS="-I../openssl/dist/include" LDFLAGS="-L../openssl/dist/lib" --disable-libevent-regress && make && make install
 
 	# Zlib
-	curl -f -LOk "https://github.com/madler/zlib/archive/refs/tags/v1.2.13.zip"
-	unzip "./v1.2.13.zip"
-	rm "./v1.2.13.zip"
-	mv "./zlib-1.2.13" "./zlib"
-	cd "./zlib" && "./configure" --prefix="$(CURDIR)/zlib/dist" && make && make install
+	curl -f -LOk "https://github.com/madler/zlib/releases/download/v1.3/zlib-1.3.tar.gz"
+	tar -xf "./zlib-1.3.tar.gz"
+	rm "./zlib-1.3.tar.gz"
+	mv "./zlib-1.3" "./zlib"
+	cd "./zlib" && "./configure" --prefix="$(CURDIR)/zlib/dist" --static && make && make install
 
 	# Tor
-	curl -f -LOk "https://github.com/torproject/tor/archive/refs/tags/tor-0.4.7.13.zip";
-	unzip "./tor-0.4.7.13.zip"
-	rm "./tor-0.4.7.13.zip"
-	mv "./tor-tor-0.4.7.13" "./tor"
-	cd "tor" && "./autogen.sh" && "./configure" --disable-gcc-hardening --disable-linker-hardening --disable-module-relay --disable-module-dirauth --enable-static-openssl --with-openssl-dir="$(CURDIR)/openssl/dist" --enable-static-libevent --with-libevent-dir="$(CURDIR)/libevent/dist" --enable-static-zlib --with-zlib-dir="$(CURDIR)/zlib/dist" --disable-asciidoc --disable-system-torrc --disable-nss --disable-systemd --disable-lzma --disable-zstd --disable-seccomp --disable-libscrypt --disable-unittests && make
+	curl -f -LOk "https://gitlab.torproject.org/tpo/core/tor/-/archive/tor-0.4.8.7/tor-tor-0.4.8.7.zip"
+	unzip "./tor-tor-0.4.8.7.zip"
+	rm "./tor-tor-0.4.8.7.zip"
+	mv "./tor-tor-0.4.8.7" "./tor"
+	cd "./tor" && "./autogen.sh" && "./configure" --enable-static-openssl --with-openssl-dir="$(CURDIR)/openssl/dist" --enable-static-libevent --with-libevent-dir="$(CURDIR)/libevent/dist" --enable-static-zlib --with-zlib-dir="$(CURDIR)/zlib/dist" --disable-module-relay --disable-module-dirauth --disable-asciidoc --disable-system-torrc --disable-nss --disable-systemd --disable-lzma --disable-zstd --disable-seccomp --disable-libscrypt && make