From 6c361a379cbbc76110e0b6f78d7d779b46f167d8 Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Sun, 2 Oct 2022 13:02:38 -0700
Subject: [PATCH] Update release docs. Update tor in snapcraft. Try fixing
 Snapcraft automatic build

---
 RELEASE.md          | 4 ++--
 snap/snapcraft.yaml | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index f54d35dc..6cf919a9 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -42,7 +42,7 @@ You also must edit these files:
 
 Make sure snapcraft packaging works. In `snap/snapcraft.yaml`:
 
-- [ ] The `tor`, `libevent`, and `obfs4` parts should be updated if necessary
+- [ ] The `tor`, `libevent`, `obfs4`, `snowflake-client`, and `meek-client` parts should be updated if necessary
 - [ ] All python packages in the `onionshare` part should be updated to match `desktop/pyproject.toml`
 - [ ] With every commit to the `develop` branch, Snapcraft's CI should trigger builds. Make sure the builds all succeeded at https://snapcraft.io/onionshare/builds (you must be logged in), and test them
 
@@ -101,7 +101,7 @@ snapcraft upload --release=stable onionshare_${VERSION}_amd64.snap
 
 Set up the packaging environment:
 
-- Install the [Windows SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/) and add `C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64` to your path (to get `signtool.exe`).
+- Install the Windows SDK from here: https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/ and add `C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool` to the path (you'll need it for `signtool.exe`)
 - Go to https://dotnet.microsoft.com/download/dotnet-framework and download and install .NET Framework 3.5 SP1 Runtime. I downloaded `dotnetfx35.exe`.
 - Go to https://wixtoolset.org/releases/ and download and install WiX toolset. I downloaded `wix311.exe`. Add `C:\Program Files (x86)\WiX Toolset v3.11\bin` to the path.
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 91671e41..4007fd97 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -133,8 +133,8 @@ parts:
     after: [tor, obfs4, snowflake-client, meek-client]
 
   tor:
-    source: https://dist.torproject.org/tor-0.4.7.8.tar.gz
-    source-checksum: sha256/9e9a5c67ad2acdd5f0f8be14ed591fed076b1708abf8344066990a0fa66fe195
+    source: https://dist.torproject.org/tor-0.4.7.9.tar.gz
+    source-checksum: sha256/d39d38598208f4d6201d7edc6ad573b3a898a932a5c68d3074016a9525519b22
     source-type: tar
     plugin: autotools
     autotools-configure-parameters:
@@ -154,6 +154,7 @@ parts:
     plugin: go
     source: https://gitlab.com/yawning/obfs4.git
     source-type: git
+    source-tag: obfs4proxy-0.0.13
 
   snowflake-client:
     plugin: go
@@ -170,5 +171,5 @@ parts:
     source-tag: v0.37.0
     override-build: |
       cd meek-client
-      mkdir /root/parts/meek-client/install/bin
+      mkdir -p /root/parts/meek-client/install/bin
       go build -o /root/parts/meek-client/install/bin/meek-client ./...