Merge pull request #12617 from kiminuo/feature/2024-03-05-Upgrade-Tor

Upgrade Tor to `0.4.8.10` from ` 0.4.8.5`
WalletWasabi · Mar 6, 2024 · 226d843 · 226d843
2 parents 6b2ac23 + 0bff633
commit 226d843
Show file tree

Hide file tree

Showing 10 changed files with 15,613 additions and 11,027 deletions.
diff --git a/WalletWasabi.Tests/UnitTests/Tor/TorBinaryHashesTests.cs b/WalletWasabi.Tests/UnitTests/Tor/TorBinaryHashesTests.cs
@@ -16,9 +16,9 @@ public void VerifyTorBinaryChecksumHashes()
 	{
 		Dictionary<OSPlatform, string> expectedHashes = new()
 		{
-			{ OSPlatform.Windows, "855799b771d166ac09e95ce99e77a219c35f1db3ed66342a2f224735c01a54bf" },
-			{ OSPlatform.Linux, "79f1fe14e2c0d00cb604f21c0836ca58e5d5205d0a9a8acfb4a5df065492bf80" },
-			{ OSPlatform.OSX, "ba028d74610083102c1f9cb95e6e746e3c0d374d61e275d3049729260900cb8b" },
+			{ OSPlatform.Windows, "33049016dd8985e97e69d89cad74b59b06488310c0be86d0f83b10ee096b7875" },
+			{ OSPlatform.Linux, "8f5f89e8dec6f4fa095ee10a9b16904cdb8a3d3f109d3b2929ff960ca15846ba" },
+			{ OSPlatform.OSX, "0360821eeb291e290f09966af87e7a1ceaba6d0a4b60e11c15249aeef288d49b" },
 		};
 
 		using SHA256 sha256 = SHA256.Create();

diff --git a/WalletWasabi/Microservices/Binaries/UpgradeTorBinaries.ps1 b/WalletWasabi/Microservices/Binaries/UpgradeTorBinaries.ps1
@@ -45,9 +45,9 @@ if ($IsWindows) {
   $sevenZip = '7zz'
 }
 
-$windowsInstaller = "torbrowser-install-win64-${version}_ALL.exe"
-$macDmg = "TorBrowser-${version}-macos_ALL.dmg"
-$linuxTarball = "tor-browser-linux64-${version}_ALL.tar"
+$windowsInstaller = "tor-browser-windows-x86_64-portable-${version}.exe"
+$macDmg = "tor-browser-macos-${version}.dmg"
+$linuxTarball = "tor-browser-linux-x86_64-${version}.tar"
 $linuxCompressedTarball = "$linuxTarball.xz"
 
 $packages = @(

diff --git a/WalletWasabi/Microservices/Binaries/lin64/Tor/libcrypto.so.3 b/WalletWasabi/Microservices/Binaries/lin64/Tor/libcrypto.so.3
diff --git a/WalletWasabi/Microservices/Binaries/lin64/Tor/libssl.so.3 b/WalletWasabi/Microservices/Binaries/lin64/Tor/libssl.so.3
diff --git a/WalletWasabi/Microservices/Binaries/lin64/Tor/tor b/WalletWasabi/Microservices/Binaries/lin64/Tor/tor
diff --git a/WalletWasabi/Microservices/Binaries/osx64/Tor/libevent-2.1.7.dylib b/WalletWasabi/Microservices/Binaries/osx64/Tor/libevent-2.1.7.dylib
diff --git a/WalletWasabi/Microservices/Binaries/osx64/Tor/tor b/WalletWasabi/Microservices/Binaries/osx64/Tor/tor
diff --git a/WalletWasabi/Microservices/Binaries/win64/Tor/tor.exe b/WalletWasabi/Microservices/Binaries/win64/Tor/tor.exe