From: tobtoht <thotbot@protonmail.com>
Date: Thu, 10 Feb 2022 12:41:24 +0000 (+0100)
Subject: Update Tor to 0.4.6.9
X-Git-Url: https://git.nutra.tk/v1?a=commitdiff_plain;h=10bc23594ef3d7b1c5bd081d8c0c3bf8de75d9d6;p=gamesguru%2Ffeather.git

Update Tor to 0.4.6.9
---

diff --git a/Dockerfile.linux b/Dockerfile.linux
index 19d03a10..f5efbe2d 100644
--- a/Dockerfile.linux
+++ b/Dockerfile.linux
@@ -11,7 +11,6 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Feather build flags
 ENV CHECK_UPDATES=ON
 ENV WITH_SCANNER=ON
-ENV TOR_VERSION=0.4.6.6
 
 COPY --from=featherwallet/feather-deps:linux-1.0.0 /deps /deps
 COPY --from=featherwallet/feather-deps:linux-1.0.0 /var/cache/apt/archives /archives
@@ -231,9 +230,9 @@ RUN git clone -b v1.2.11 --depth 1 https://github.com/madler/zlib && \
 # Tor: Optional for Feather (-DTOR_BIN)
 # Binary can be embedded in Feather
 ENV TOR_BIN=/usr/local/tor/bin/tor
-RUN git clone -b tor-$TOR_VERSION --depth 1 https://git.torproject.org/tor.git && \
+RUN git clone -b tor-0.4.6.9 --depth 1 https://git.torproject.org/tor.git && \
     cd tor && \
-    git reset --hard 60d1fb3d37274e29e9e88620d77e1636ef922561 && \
+    git reset --hard ea2ada6d1459f829446b6b1e66c557d1b084e78b && \
     ./autogen.sh && \
     ./configure \
     --disable-asciidoc \
diff --git a/Dockerfile.windows b/Dockerfile.windows
index 933c9ff7..45456072 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -11,7 +11,6 @@ ENV WITH_SCANNER=ON
 
 ENV OPENSSL_ROOT_DIR=/usr/local/openssl/
 ENV TOR_BIN=/usr/local/tor/bin/tor.exe
-ENV TOR_VERSION=0.4.6.6
 
 RUN apt update && \
     apt install -y \
@@ -155,9 +154,9 @@ RUN wget https://github.com/libevent/libevent/releases/download/release-2.1.11-s
     make -j$THREADS install && \
     rm -rf $(pwd)
 
-RUN git clone -b tor-$TOR_VERSION --depth 1 https://git.torproject.org/tor.git && \
+RUN git clone -b tor-0.4.6.9 --depth 1 https://git.torproject.org/tor.git && \
     cd tor  && \
-    git reset --hard 60d1fb3d37274e29e9e88620d77e1636ef922561 && \
+    git reset --hard ea2ada6d1459f829446b6b1e66c557d1b084e78b && \
     ./autogen.sh && \
     ./configure --host=x86_64-w64-mingw32 \
     --disable-asciidoc \