Merge remote-tracking branch 'origin/develop' into rust-develop

1 files changed, 25 insertions, 2 deletions

diff --git a/apply_patches.sh b/apply_patches.sh
index 22c3bba..8013c9d 100755
--- a/apply_patches.sh
+++ b/apply_patches.sh
@@ -38,7 +38,30 @@ then
         git remote set-url origin https://github.com/mrcyjanek/randomwow.git
     popd
 fi
+if [[ "$repo" == "zano" ]];
+then
+    pushd contrib/tor-connect
+         git remote set-url origin https://github.com/mrcyjanek/tor-connect.git
+    popd
+fi
 git submodule init
 git submodule update --init --recursive --force
-touch .patch-applied
-echo "you are good to go!"
\ No newline at end of file
+git am -3 <<EOF
+From e56dd6cd0fb1a5e55d3cb08691edf24b26d65299 Mon Sep 17 00:00:00 2001
+From: Czarek Nakamoto <cyjan@mrcyjanek.net>
+Date: Fri, 20 Dec 2024 09:18:08 +0100
+Subject: [PATCH] add .patch-applied
+
+---
+ .patch-applied | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 .patch-applied
+
+diff --git a/.patch-applied b/.patch-applied
+new file mode 100644
+index 000000000..e69de29bb
+-- 
+2.39.5 (Apple Git-154)
+EOF
+
+echo "you are good to go!"