From 6af2c26c1e3d396f6afcc35a0e5439346ea6e2fe Mon Sep 17 00:00:00 2001
From: Miguel Jacq <mig@mig5.net>
Date: Sun, 11 Dec 2022 15:53:31 +1100
Subject: [PATCH] Update tor to 0.4.7.12 for flatpak/snap, fetch Tor Browser
 12.0

---
 desktop/scripts/get-tor.py             | 26 +++++++++++++-------------
 flatpak/org.onionshare.OnionShare.yaml |  4 ++--
 snap/snapcraft.yaml                    |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/desktop/scripts/get-tor.py b/desktop/scripts/get-tor.py
index 719b7392..e110e504 100644
--- a/desktop/scripts/get-tor.py
+++ b/desktop/scripts/get-tor.py
@@ -9,28 +9,28 @@ import subprocess
 import requests
 import click
 
-torbrowser_version = "11.5.4"
+torbrowser_version = "12.0"
 expected_win32_sha256 = (
-    "5179df98761d7c52c03cbea41af75148e9164fccc0f5ad89962f05f9cd8c6261"
+    "a9cc0f0af2ce8ca0d7a27d65c7efa37f6419cfc793fa80371e7db73d44b4cc02"
 )
 expected_win64_sha256 = (
-    "cee248528addbba59db355fca4a177746fdafd35e6e87d1b86cca2e8508dc8a7"
+    "f496cc0219c8b73f1f100124d6514bad55f503ff76202747f23620a6677e83c2"
 )
 expected_macos_sha256 = (
-    "de86f4462ee287b89504cf4145f769f7be482e8d6e23241817cdef602b06f6b5"
+    "11c8360187356e6c0837612a320f1a117303fc449602c9fd73f4faf9f9bbcfc9"
 )
 expected_linux64_sha256 = (
-    "db73fc130d1ab0ea6d0d8549d3103e01338e4fdda7cff236176f82b007a37caa"
+    "850ce601d815bac63e4f5937646d2b497173be28b27b30a7526ebb946a459874"
 )
 
-win32_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/torbrowser-install-{torbrowser_version}_en-US.exe"
-win32_filename = f"torbrowser-install-{torbrowser_version}_en-US.exe"
-win64_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/torbrowser-install-win64-{torbrowser_version}_en-US.exe"
-win64_filename = f"torbrowser-install-win64-{torbrowser_version}_en-US.exe"
-macos_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/TorBrowser-{torbrowser_version}-osx64_en-US.dmg"
-macos_filename = f"TorBrowser-{torbrowser_version}-osx64_en-US.dmg"
-linux64_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/tor-browser-linux64-{torbrowser_version}_en-US.tar.xz"
-linux64_filename = f"tor-browser-linux64-{torbrowser_version}_en-US.tar.xz"
+win32_filename = f"torbrowser-install-{torbrowser_version}_ALL.exe"
+win32_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/{win32_filename}"
+win64_filename = f"torbrowser-install-win64-{torbrowser_version}_ALL.exe"
+win64_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/{win64_filename}"
+macos_filename = f"TorBrowser-{torbrowser_version}-osx64_ALL.dmg"
+macos_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/{macos_filename}"
+linux64_filename = f"tor-browser-linux64-{torbrowser_version}_ALL.tar.xz"
+linux64_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/{linux64_filename}"
 
 
 # Common paths
diff --git a/flatpak/org.onionshare.OnionShare.yaml b/flatpak/org.onionshare.OnionShare.yaml
index cbec8b76..28e6aca0 100644
--- a/flatpak/org.onionshare.OnionShare.yaml
+++ b/flatpak/org.onionshare.OnionShare.yaml
@@ -45,8 +45,8 @@ modules:
     buildsystem: autotools
     sources:
       - type: archive
-        sha256: 647e56dfa59ea36dab052027fcfc7663905c826c03509363c456900ecd435a5b
-        url: https://dist.torproject.org/tor-0.4.7.10.tar.gz
+        sha256: 3b5d969712c467851bd028f314343ef15a97ea457191e93ffa97310b05b9e395
+        url: https://dist.torproject.org/tor-0.4.7.12.tar.gz
     modules:
       - name: libevent
         buildsystem: autotools
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index b70631b9..d7f798fb 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -194,8 +194,8 @@ parts:
     after: [onionshare-cli]
 
   tor:
-    source: https://dist.torproject.org/tor-0.4.7.10.tar.gz
-    source-checksum: sha256/647e56dfa59ea36dab052027fcfc7663905c826c03509363c456900ecd435a5b
+    source: https://dist.torproject.org/tor-0.4.7.12.tar.gz
+    source-checksum: sha256/3b5d969712c467851bd028f314343ef15a97ea457191e93ffa97310b05b9e395
     source-type: tar
     plugin: autotools
     autotools-configure-parameters: