diff --git a/Dockerfile-linux b/Dockerfile-linux
index 72373d5..495451a 100644
--- a/Dockerfile-linux
+++ b/Dockerfile-linux
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:noble
 
 ARG zlib_version
 ARG zlib_hash
@@ -43,8 +43,8 @@ RUN \
   tar -zxvf "zlib-$zlib_version.tar.gz"
 
 RUN \
-  curl --proto '=https' --tlsv1.3 -fsSL "https://www.openssl.org/source/openssl-$openssl_version.tar.gz" -o "openssl-$openssl_version.tar.gz" && \
-  curl --proto '=https' --tlsv1.3 -fsSL "https://www.openssl.org/source/openssl-$openssl_version.tar.gz.asc" -o "openssl-$openssl_version.tar.gz.asc" && \
+  curl --proto '=https' --tlsv1.3 -fsSL "https://github.com/openssl/openssl/releases/download/openssl-$openssl_version/openssl-$openssl_version.tar.gz" -o "openssl-$openssl_version.tar.gz" && \
+  curl --proto '=https' --tlsv1.3 -fsSL "https://github.com/openssl/openssl/releases/download/openssl-$openssl_version/openssl-$openssl_version.tar.gz.asc" -o "openssl-$openssl_version.tar.gz.asc" && \
   gpg --keyring /openssl.gpg --verify "openssl-$openssl_version.tar.gz.asc" "openssl-$openssl_version.tar.gz" && \
   echo "$openssl_hash  openssl-$openssl_version.tar.gz" | shasum -a 256 -c - && \
   tar -xvzf "openssl-$openssl_version.tar.gz"
@@ -76,10 +76,33 @@ RUN \
 RUN \
   cd "openssl-$openssl_version" && \
   ./config --prefix="$PWD/root" --libdir=lib \
+    no-apps \
+    no-cmp \
+    no-cms \
+    no-comp \
+    no-ct \
+    no-dgram \
+    no-docs \
     no-dso \
+    no-ec2m \
+    no-engine \
+    no-http \
+    no-legacy \
+    no-module \
+    no-nextprotoneg \
+    no-ocsp \
+    no-padlockeng \
+    no-psk \
+    no-quic \
+    no-rfc3779 \
     no-shared \
+    no-srp \
+    no-srtp \
     no-ssl-trace \
-    no-ui-console && \
+    no-static-engine \
+    no-ts \
+    no-ui-console \
+    no-uplink && \
   make ${jobs:+-j${jobs}} && \
   make test && \
   make install
diff --git a/Dockerfile-linux-arm64 b/Dockerfile-linux-arm64
index 9ea8df3..d61d52d 100644
--- a/Dockerfile-linux-arm64
+++ b/Dockerfile-linux-arm64
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:noble
 
 ARG zlib_version
 ARG zlib_hash
@@ -44,8 +44,8 @@ RUN \
   tar -zxvf "zlib-$zlib_version.tar.gz"
 
 RUN \
-  curl --proto '=https' --tlsv1.3 -fsSL "https://www.openssl.org/source/openssl-$openssl_version.tar.gz" -o "openssl-$openssl_version.tar.gz" && \
-  curl --proto '=https' --tlsv1.3 -fsSL "https://www.openssl.org/source/openssl-$openssl_version.tar.gz.asc" -o "openssl-$openssl_version.tar.gz.asc" && \
+  curl --proto '=https' --tlsv1.3 -fsSL "https://github.com/openssl/openssl/releases/download/openssl-$openssl_version/openssl-$openssl_version.tar.gz" -o "openssl-$openssl_version.tar.gz" && \
+  curl --proto '=https' --tlsv1.3 -fsSL "https://github.com/openssl/openssl/releases/download/openssl-$openssl_version/openssl-$openssl_version.tar.gz.asc" -o "openssl-$openssl_version.tar.gz.asc" && \
   gpg --keyring /openssl.gpg --verify "openssl-$openssl_version.tar.gz.asc" "openssl-$openssl_version.tar.gz" && \
   echo "$openssl_hash  openssl-$openssl_version.tar.gz" | shasum -a 256 -c - && \
   tar -xvzf "openssl-$openssl_version.tar.gz"
@@ -79,10 +79,33 @@ RUN \
   ./Configure --prefix="$PWD/root" \
     --cross-compile-prefix=aarch64-linux-gnu- \
     linux-aarch64 \
+    no-apps \
+    no-cmp \
+    no-cms \
+    no-comp \
+    no-ct \
+    no-dgram \
+    no-docs \
     no-dso \
+    no-ec2m \
+    no-engine \
+    no-http \
+    no-legacy \
+    no-module \
+    no-nextprotoneg \
+    no-ocsp \
+    no-padlockeng \
+    no-psk \
+    no-quic \
+    no-rfc3779 \
     no-shared \
+    no-srp \
+    no-srtp \
     no-ssl-trace \
-    no-ui-console && \
+    no-static-engine \
+    no-ts \
+    no-ui-console \
+    no-uplink && \
   make ${jobs:+-j${jobs}} && \
   make install_sw
 
diff --git a/Dockerfile-mingw b/Dockerfile-mingw
index 11cec1d..b0f1652 100644
--- a/Dockerfile-mingw
+++ b/Dockerfile-mingw
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:noble
 
 ARG zlib_version
 ARG zlib_hash
@@ -43,8 +43,8 @@ RUN \
   tar -zxvf "zlib-$zlib_version.tar.gz"
 
 RUN \
-  curl --proto '=https' --tlsv1.3 -fsSL "https://www.openssl.org/source/openssl-$openssl_version.tar.gz" -o "openssl-$openssl_version.tar.gz" && \
-  curl --proto '=https' --tlsv1.3 -fsSL "https://www.openssl.org/source/openssl-$openssl_version.tar.gz.asc" -o "openssl-$openssl_version.tar.gz.asc" && \
+  curl --proto '=https' --tlsv1.3 -fsSL "https://github.com/openssl/openssl/releases/download/openssl-$openssl_version/openssl-$openssl_version.tar.gz" -o "openssl-$openssl_version.tar.gz" && \
+  curl --proto '=https' --tlsv1.3 -fsSL "https://github.com/openssl/openssl/releases/download/openssl-$openssl_version/openssl-$openssl_version.tar.gz.asc" -o "openssl-$openssl_version.tar.gz.asc" && \
   gpg --keyring /openssl.gpg --verify "openssl-$openssl_version.tar.gz.asc" "openssl-$openssl_version.tar.gz" && \
   echo "$openssl_hash  openssl-$openssl_version.tar.gz" | shasum -a 256 -c - && \
   tar -xvzf "openssl-$openssl_version.tar.gz"
@@ -80,10 +80,33 @@ RUN \
   ./Configure --prefix="$PWD/root" \
     --cross-compile-prefix=i686-w64-mingw32- \
     mingw \
+    no-apps \
+    no-cmp \
+    no-cms \
+    no-comp \
+    no-ct \
+    no-dgram \
+    no-docs \
     no-dso \
+    no-ec2m \
+    no-engine \
+    no-http \
+    no-legacy \
+    no-module \
+    no-nextprotoneg \
+    no-ocsp \
+    no-padlockeng \
+    no-psk \
+    no-quic \
+    no-rfc3779 \
     no-shared \
+    no-srp \
+    no-srtp \
     no-ssl-trace \
-    no-ui-console && \
+    no-static-engine \
+    no-ts \
+    no-ui-console \
+    no-uplink && \
   make ${jobs:+-j${jobs}} && \
   make install_sw
 
diff --git a/build_darwin.sh b/build_darwin.sh
index 1634d16..bf35368 100755
--- a/build_darwin.sh
+++ b/build_darwin.sh
@@ -6,8 +6,8 @@ curl --proto '=https' --tlsv1.2 -fsSL "https://zlib.net/zlib-$ZLIB_VERSION.tar.g
 GNUPGHOME="$PWD" gpg --keyring gpg-keys/zlib.gpg --verify "zlib-$ZLIB_VERSION.tar.gz.asc" "zlib-$ZLIB_VERSION.tar.gz"
 echo "$ZLIB_HASH  zlib-$ZLIB_VERSION.tar.gz" | shasum -a 256 -c -
 
-curl --proto '=https' --tlsv1.2 -fsSL "https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz" -o "openssl-$OPENSSL_VERSION.tar.gz"
-curl --proto '=https' --tlsv1.2 -fsSL "https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz.asc" -o "openssl-$OPENSSL_VERSION.tar.gz.asc"
+curl --proto '=https' --tlsv1.2 -fsSL "https://github.com/openssl/openssl/releases/download/openssl-$OPENSSL_VERSION/openssl-$OPENSSL_VERSION.tar.gz" -o "openssl-$OPENSSL_VERSION.tar.gz"
+curl --proto '=https' --tlsv1.2 -fsSL "https://github.com/openssl/openssl/releases/download/openssl-$OPENSSL_VERSION/openssl-$OPENSSL_VERSION.tar.gz.asc" -o "openssl-$OPENSSL_VERSION.tar.gz.asc"
 GNUPGHOME="$PWD" gpg --keyring gpg-keys/openssl.gpg --verify "openssl-$OPENSSL_VERSION.tar.gz.asc" "openssl-$OPENSSL_VERSION.tar.gz"
 echo "$OPENSSL_HASH  openssl-$OPENSSL_VERSION.tar.gz" | shasum -a 256 -c -
 
diff --git a/build_darwin_arm64.sh b/build_darwin_arm64.sh
index 84fe5b1..09aaa3e 100755
--- a/build_darwin_arm64.sh
+++ b/build_darwin_arm64.sh
@@ -1,6 +1,9 @@
 #!/bin/sh -eu
 
-echo "running build_darwin_arm64.sh..."
+BUILD_CPU=arm64
+BUILD_HOST=arm-apple-darwin
+
+echo "running build_darwin_$BUILD_CPU.sh..."
 
 SDK_PATH=$(xcrun --show-sdk-path)
 XCODE_LIB="$SDK_PATH/usr/lib/"
@@ -16,68 +19,92 @@ else
   jobs=$(sysctl -n hw.logicalcpu_max)
 fi
 
-rm -rf arm64 && mkdir arm64
+rm -rf $BUILD_CPU && mkdir $BUILD_CPU
 
-tar -xvzf "zlib-$ZLIB_VERSION.tar.gz" -C arm64
-cd "arm64/zlib-$ZLIB_VERSION"
-CFLAGS="-target arm64-apple-macos11" LDFLAGS="-target arm64-apple-macos11" ./configure --prefix="$PWD/root"
-make ${jobs:+-j${jobs}} && make install
+tar -xvzf "zlib-$ZLIB_VERSION.tar.gz" -C $BUILD_CPU
+cd "$BUILD_CPU/zlib-$ZLIB_VERSION"
+CFLAGS="-target $BUILD_CPU-apple-macos11" LDFLAGS="-target $BUILD_CPU-apple-macos11" ./configure --prefix="$PWD/root"
+make ${jobs:+-j${jobs}} && make ${jobs:+-j${jobs}} check && make install
 cd ../../
 
-tar -xvzf "openssl-$OPENSSL_VERSION.tar.gz" -C arm64
-cd "arm64/openssl-$OPENSSL_VERSION"
+tar -xvzf "openssl-$OPENSSL_VERSION.tar.gz" -C $BUILD_CPU
+cd "$BUILD_CPU/openssl-$OPENSSL_VERSION"
 ./Configure --prefix="$PWD/root" \
-            darwin64-arm64-cc \
-            no-dso \
-            no-shared \
-            no-ssl-trace \
-            no-ui-console
-
-make ${jobs:+-j${jobs}} && make install
+  darwin64-$BUILD_CPU-cc \
+  no-apps \
+  no-cmp \
+  no-cms \
+  no-comp \
+  no-ct \
+  no-dgram \
+  no-docs \
+  no-dso \
+  no-ec2m \
+  no-engine \
+  no-http \
+  no-legacy \
+  no-module \
+  no-nextprotoneg \
+  no-ocsp \
+  no-padlockeng \
+  no-psk \
+  no-quic \
+  no-rfc3779 \
+  no-shared \
+  no-srp \
+  no-srtp \
+  no-ssl-trace \
+  no-static-engine \
+  no-ts \
+  no-ui-console \
+  no-uplink
+make ${jobs:+-j${jobs}} && make test && make install
 cd ../../
 
 #Apple messed up getentropy and clock_gettimesymbols when they added two functions in Sierra: 
 #they forgot to decorate them with appropriate AVAILABLE_MAC_OS_VERSION checks. 
 #So we have to explicitly disable them for binaries to work on MacOS 10.11.
 
-tar -zxvf "libevent-$LIBEVENT_VERSION.tar.gz" -C arm64
-cd "arm64/libevent-$LIBEVENT_VERSION"
+tar -zxvf "libevent-$LIBEVENT_VERSION.tar.gz" -C $BUILD_CPU
+cd "$BUILD_CPU/libevent-$LIBEVENT_VERSION"
 patch -p0 < ../../patch/libevent/regress.c.patch
+patch -p0 < ../../patch/libevent/regress_http.c.patch
 ./configure \
-	    LDFLAGS="-L$PWD/../openssl-$OPENSSL_VERSION/root/lib --target=arm64-apple-macos11" \
-	    CPPFLAGS="-I$PWD/../openssl-$OPENSSL_VERSION/include --target=arm64-apple-macos11" \
-	    --prefix="$PWD/install" \
-	    --disable-openssl \
-	    --disable-shared \
-	    --enable-static \
-            --host=arm-apple-darwin \
-	    --disable-clock-gettime \
-	    --with-pic
+  LDFLAGS="-L$PWD/../openssl-$OPENSSL_VERSION/root/lib --target=$BUILD_CPU-apple-macos11" \
+  CPPFLAGS="-I$PWD/../openssl-$OPENSSL_VERSION/include --target=$BUILD_CPU-apple-macos11" \
+  --prefix="$PWD/install" \
+  --disable-openssl \
+  --disable-shared \
+  --enable-static \
+  --host=$BUILD_HOST \
+  --disable-clock-gettime \
+  --with-pic
 make ${jobs:+-j${jobs}} && make ${jobs:+-j${jobs}} check && make install
 cd ../../
 
-tar -xvzf "tor-$TOR_VERSION.tar.gz" -C arm64
-cd "arm64/tor-$TOR_VERSION"
+tar -xvzf "tor-$TOR_VERSION.tar.gz" -C $BUILD_CPU
+cd "$BUILD_CPU/tor-$TOR_VERSION"
+patch -p0 < ../../patch/tor/test_slow.c.patch
 ./configure \
-	    LDFLAGS="--target=arm64-apple-macos11 -L$XCODE_LIB" \
-	    CPPFLAGS="--target=arm64-apple-macos11 -I$XCODE_INCLUDE" \
-	    --prefix="$PWD/root" \
-	    --enable-static-libevent \
-	    --enable-static-openssl  \
-	    --enable-static-zlib  \
-	    --with-libevent-dir="$PWD/../libevent-$LIBEVENT_VERSION/install" \
-	    --with-openssl-dir="$PWD/../openssl-$OPENSSL_VERSION/root" \
-	    --with-zlib-dir="$PWD/../zlib-$ZLIB_VERSION/root" \
-	    --disable-asciidoc \
-	    --disable-html-manual \
-	    --disable-lzma \
-	    --disable-manpage \
-            --disable-zstd \
-            --disable-module-relay \
-            --disable-module-dirauth \
-            --host=arm-apple-darwin \
-            --disable-tool-name-check \
-	    ac_cv_func_getentropy=no \
-	    ac_cv_func_clock_gettime=no
+  LDFLAGS="--target=$BUILD_CPU-apple-macos11 -L$XCODE_LIB" \
+  CPPFLAGS="--target=$BUILD_CPU-apple-macos11 -I$XCODE_INCLUDE" \
+  --prefix="$PWD/root" \
+  --enable-static-libevent \
+  --enable-static-openssl  \
+  --enable-static-zlib  \
+  --with-libevent-dir="$PWD/../libevent-$LIBEVENT_VERSION/install" \
+  --with-openssl-dir="$PWD/../openssl-$OPENSSL_VERSION/root" \
+  --with-zlib-dir="$PWD/../zlib-$ZLIB_VERSION/root" \
+  --disable-asciidoc \
+  --disable-html-manual \
+  --disable-lzma \
+  --disable-manpage \
+  --disable-zstd \
+  --disable-module-relay \
+  --disable-module-dirauth \
+  --host=$BUILD_HOST \
+  --disable-tool-name-check \
+  ac_cv_func_getentropy=no \
+  ac_cv_func_clock_gettime=no
 make ${jobs:+-j${jobs}} && make install
 cd ../../
diff --git a/build_darwin_x86_64.sh b/build_darwin_x86_64.sh
index de195cb..f889866 100755
--- a/build_darwin_x86_64.sh
+++ b/build_darwin_x86_64.sh
@@ -1,6 +1,9 @@
 #!/bin/sh -eu
 
-echo "running build_darwin_x86_64.sh..."
+BUILD_CPU=x86_64
+BUILD_HOST=x86_64
+
+echo "running build_darwin_$BUILD_CPU.sh..."
 
 SDK_PATH=$(xcrun --show-sdk-path)
 XCODE_LIB="$SDK_PATH/usr/lib/"
@@ -16,22 +19,45 @@ else
   jobs=$(sysctl -n hw.logicalcpu_max)
 fi
 
-rm -rf x86_64 && mkdir x86_64
+rm -rf $BUILD_CPU && mkdir $BUILD_CPU
 
-tar -xvzf "zlib-$ZLIB_VERSION.tar.gz" -C x86_64
-cd "x86_64/zlib-$ZLIB_VERSION"
-./configure --prefix="$PWD/root"
-make ${jobs:+-j${jobs}} && make ${jobs:+-j$jobs} check && make install
+tar -xvzf "zlib-$ZLIB_VERSION.tar.gz" -C $BUILD_CPU
+cd "$BUILD_CPU/zlib-$ZLIB_VERSION"
+CFLAGS="-target $BUILD_CPU-apple-macos11" LDFLAGS="-target $BUILD_CPU-apple-macos11" ./configure --prefix="$PWD/root"
+make ${jobs:+-j${jobs}} && make ${jobs:+-j${jobs}} check && make install
 cd ../../
 
-tar -xvzf "openssl-$OPENSSL_VERSION.tar.gz" -C x86_64
-cd "x86_64/openssl-$OPENSSL_VERSION"
+tar -xvzf "openssl-$OPENSSL_VERSION.tar.gz" -C $BUILD_CPU
+cd "$BUILD_CPU/openssl-$OPENSSL_VERSION"
 ./Configure --prefix="$PWD/root" \
-            darwin64-x86_64-cc \
-            no-dso \
-            no-shared \
-            no-ssl-trace \
-            no-ui-console
+  darwin64-$BUILD_CPU-cc \
+  no-apps \
+  no-cmp \
+  no-cms \
+  no-comp \
+  no-ct \
+  no-dgram \
+  no-docs \
+  no-dso \
+  no-ec2m \
+  no-engine \
+  no-http \
+  no-legacy \
+  no-module \
+  no-nextprotoneg \
+  no-ocsp \
+  no-padlockeng \
+  no-psk \
+  no-quic \
+  no-rfc3779 \
+  no-shared \
+  no-srp \
+  no-srtp \
+  no-ssl-trace \
+  no-static-engine \
+  no-ts \
+  no-ui-console \
+  no-uplink
 make ${jobs:+-j${jobs}} && make test && make install
 cd ../../
 
@@ -39,41 +65,46 @@ cd ../../
 #they forgot to decorate them with appropriate AVAILABLE_MAC_OS_VERSION checks. 
 #So we have to explicitly disable them for binaries to work on MacOS 10.11.
 
-tar -zxvf "libevent-$LIBEVENT_VERSION.tar.gz" -C x86_64
-cd "x86_64/libevent-$LIBEVENT_VERSION"
+tar -zxvf "libevent-$LIBEVENT_VERSION.tar.gz" -C $BUILD_CPU
+cd "$BUILD_CPU/libevent-$LIBEVENT_VERSION"
 patch -p0 < ../../patch/libevent/regress.c.patch
+patch -p0 < ../../patch/libevent/regress_http.c.patch
 ./configure \
-            LDFLAGS="-L$PWD/../openssl-$OPENSSL_VERSION/root/lib" \
-            CPPFLAGS="-I$PWD/../openssl-$OPENSSL_VERSION/include" \
-            --prefix="$PWD/install" \
-            --disable-openssl \
-            --disable-shared \
-            --enable-static \
-            --disable-clock-gettime \
-            --with-pic
+  LDFLAGS="-L$PWD/../openssl-$OPENSSL_VERSION/root/lib --target=$BUILD_CPU-apple-macos11" \
+  CPPFLAGS="-I$PWD/../openssl-$OPENSSL_VERSION/include --target=$BUILD_CPU-apple-macos11" \
+  --prefix="$PWD/install" \
+  --disable-openssl \
+  --disable-shared \
+  --enable-static \
+  --host=$BUILD_HOST \
+  --disable-clock-gettime \
+  --with-pic
 make ${jobs:+-j${jobs}} && make ${jobs:+-j${jobs}} check && make install
 cd ../../
 
-tar -xvzf "tor-$TOR_VERSION.tar.gz" -C x86_64
-cd "x86_64/tor-$TOR_VERSION"
+tar -xvzf "tor-$TOR_VERSION.tar.gz" -C $BUILD_CPU
+cd "$BUILD_CPU/tor-$TOR_VERSION"
+patch -p0 < ../../patch/tor/test_slow.c.patch
 ./configure \
-            LDFLAGS="-L$XCODE_LIB" \
-            CPPFLAGS="-I$XCODE_INCLUDE" \
-            --prefix="$PWD/root" \
-            --enable-static-libevent \
-            --enable-static-openssl  \
-            --enable-static-zlib  \
-            --with-libevent-dir="$PWD/../libevent-$LIBEVENT_VERSION/install" \
-            --with-openssl-dir="$PWD/../openssl-$OPENSSL_VERSION/root" \
-            --with-zlib-dir="$PWD/../zlib-$ZLIB_VERSION/root" \
-            --disable-asciidoc \
-            --disable-html-manual \
-            --disable-lzma \
-            --disable-manpage \
-            --disable-zstd \
-            --disable-module-relay \
-            --disable-module-dirauth \
-            ac_cv_func_getentropy=no \
-            ac_cv_func_clock_gettime=no
+  LDFLAGS="--target=$BUILD_CPU-apple-macos11 -L$XCODE_LIB" \
+  CPPFLAGS="--target=$BUILD_CPU-apple-macos11 -I$XCODE_INCLUDE" \
+  --prefix="$PWD/root" \
+  --enable-static-libevent \
+  --enable-static-openssl  \
+  --enable-static-zlib  \
+  --with-libevent-dir="$PWD/../libevent-$LIBEVENT_VERSION/install" \
+  --with-openssl-dir="$PWD/../openssl-$OPENSSL_VERSION/root" \
+  --with-zlib-dir="$PWD/../zlib-$ZLIB_VERSION/root" \
+  --disable-asciidoc \
+  --disable-html-manual \
+  --disable-lzma \
+  --disable-manpage \
+  --disable-zstd \
+  --disable-module-relay \
+  --disable-module-dirauth \
+  --host=$BUILD_HOST \
+  --disable-tool-name-check \
+  ac_cv_func_getentropy=no \
+  ac_cv_func_clock_gettime=no
 make ${jobs:+-j${jobs}} && make ${jobs:+-j${jobs}} check && make install
 cd ../../
diff --git a/darwin_deps.sh b/darwin_deps.sh
index e11186d..be12095 100755
--- a/darwin_deps.sh
+++ b/darwin_deps.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -eu
 
-GPG_VERSION=2.4.3
-GPG_HASH=a271ae6d732f6f4d80c258ad9ee88dd9c94c8fdc33c3e45328c4d7c126bd219d
+GPG_VERSION=2.4.7
+GPG_HASH=7b24706e4da7e0e3b06ca068231027401f238102c41c909631349dcc3b85eb46
 
 curl --proto '=https' --tlsv1.2 -fsSL -o "gnupg-$GPG_VERSION.tar.bz2" "https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-$GPG_VERSION.tar.bz2"
 echo "$GPG_HASH  gnupg-$GPG_VERSION.tar.bz2" | shasum -a 256 -c -
diff --git a/env.sh b/env.sh
old mode 100644
new mode 100755
index 1cdfba2..35e6f09
--- a/env.sh
+++ b/env.sh
@@ -4,17 +4,17 @@
 export MACOSX_DEPLOYMENT_TARGET=10.15
 
 # Reset version number to zero everytime TOR_VERSION changes.
-export BRAVE_TOR_VERSION="2"
+export BRAVE_TOR_VERSION="0"
 
-export TOR_VERSION="0.4.8.10"
+export TOR_VERSION="0.4.8.19"
 
 export ZLIB_VERSION="1.3.1"
 export LIBEVENT_VERSION="2.1.12-stable"
-export OPENSSL_VERSION="3.0.13"
+export OPENSSL_VERSION="3.6.0"
 
 export ZLIB_HASH="9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23"
 export LIBEVENT_HASH=92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
-export OPENSSL_HASH="88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313"
-export TOR_HASH="e628b4fab70edb4727715b23cf2931375a9f7685ac08f2c59ea498a178463a86"
+export OPENSSL_HASH="b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9"
+export TOR_HASH="3cb649a1d33ba6a65f109d224534e93aaf0a6de84a5b1cb4b054bfa06bb74f5a"
 
 export DOCKER="$(command -v docker || command -v podman)"
diff --git a/gpg-keys/openssl.gpg b/gpg-keys/openssl.gpg
index 98031ee..aa017e3 100644
Binary files a/gpg-keys/openssl.gpg and b/gpg-keys/openssl.gpg differ
diff --git a/patch/libevent/regress_http.c.patch b/patch/libevent/regress_http.c.patch
new file mode 100644
index 0000000..4361894
--- /dev/null
+++ b/patch/libevent/regress_http.c.patch
@@ -0,0 +1,14 @@
+Description: Disable test failing on macOS
+Last-Update: 2025-10-03
+Bug-Brave: https://github.com/brave/tor_build_scripts/issues/156
+
+--- test/regress_http.c.orig	2025-10-03 14:43:40.534171434 -0700
++++ test/regress_http.c	2025-10-03 14:43:57.036915079 -0700
+@@ -4759,7 +4759,6 @@
+ 	{ "connection_retry_conn_address", http_connection_retry_conn_address_test,
+ 	  TT_ISOLATED|TT_OFF_BY_DEFAULT, &basic_setup, NULL },
+ 
+-	HTTP(data_length_constraints),
+ 	HTTP(read_on_write_error),
+ 	HTTP(non_lingering_close),
+ 	HTTP(lingering_close),
diff --git a/patch/tor/test_slow.c.patch b/patch/tor/test_slow.c.patch
new file mode 100644
index 0000000..32ba5aa
--- /dev/null
+++ b/patch/tor/test_slow.c.patch
@@ -0,0 +1,19 @@
+Description: Disable failing tests on Mac
+Last-Update: 2025-01-15
+
+--- src/test/test_slow.c	2024-10-24 07:38:41.000000000 -0700
++++ src/test/test_slow.c.brave	2025-01-15 21:02:34.931958360 -0800
+@@ -19,11 +19,13 @@
+ #include "test/test.h"
+ 
+ struct testgroup_t testgroups[] = {
++#ifndef __APPLE__
+   { "slow/crypto/", slow_crypto_tests },
+   { "slow/process/", slow_process_tests },
+   { "slow/hs_pow/", slow_hs_pow_tests },
+   { "slow/prob_distr/", slow_stochastic_prob_distr_tests },
+   { "slow/ptr/", slow_ptr_tests },
+   END_OF_GROUPS
++#endif
+ };
+ 
diff --git a/renovate.json b/renovate.json
index 6e0cc75..65c2ad0 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,5 +1,7 @@
 {
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "local>brave/renovate-config"
-  ]
+  ],
+  "addLabels": ["CI/skip", "dependencies", "renovate"]
 }