Update Tor, snowflake versions, and rejig Flatpak to build pluggable transports using our existing scripts, same as other packaging

2025-04-05 04:15:42 -04:00 · 2025-02-06 17:16:58 +11:00 · 2025-02-06 17:16:58 +11:00 · 916c37640b
commit 916c37640b
parent b5694daa27
5 changed files with 46 additions and 253 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -254,7 +254,7 @@ jobs:
      - name: Flatpak build
        run: |
          cd flatpak
-          flatpak-builder build --force-clean --install-deps-from=flathub --install --user org.onionshare.OnionShare.yaml
+          flatpak-builder build --force-clean --keep-build-dirs --verbose --install-deps-from=flathub --install --user org.onionshare.OnionShare.yaml
          flatpak build-bundle ~/.local/share/flatpak/repo ~/OnionShare.flatpak org.onionshare.OnionShare --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo

      - uses: actions/upload-artifact@v4
--- a/desktop/scripts/build-pt-snowflake.ps1
+++ b/desktop/scripts/build-pt-snowflake.ps1
@ -1,4 +1,4 @@
-$env:SNOWFLAKE_TAG = 'v2.8.1'
+$env:SNOWFLAKE_TAG = 'v2.10.1'

 New-Item -ItemType Directory -Force -Path .\build\snowflake
 cd .\build\snowflake
--- a/desktop/scripts/build-pt-snowflake.sh
+++ b/desktop/scripts/build-pt-snowflake.sh
@ -1,5 +1,5 @@
 #!/bin/bash
-SNOWFLAKE_TAG=v2.8.1
+SNOWFLAKE_TAG=v2.10.1

 OS=$(uname -s)

--- a/flatpak/org.onionshare.OnionShare.yaml
+++ b/flatpak/org.onionshare.OnionShare.yaml
@ -50,8 +50,8 @@ modules:
    buildsystem: autotools
    sources:
      - type: archive
-        sha256: 59bb7d8890f6131b4ce5344f3dcea5deb2182b7f4f10ff0cb4e4d81f11b2cf65
-        url: https://dist.torproject.org/tor-0.4.8.9.tar.gz
+        sha256: 9baf26c387a2820b3942da572146e6eb77c2bc66862af6297cd02a074e6fba28
+        url: https://dist.torproject.org/tor-0.4.8.13.tar.gz
    modules:
      - name: libevent
        buildsystem: autotools
@ -62,240 +62,33 @@ modules:
  - name: obfs4proxy
    buildsystem: simple
    build-options:
-      env:
-        GOBIN: "/app/bin/"
+      build-args:
+        - --share=network
    build-commands:
-      - ". /usr/lib/sdk/golang/enable.sh; export GOPATH=$PWD; export GO111MODULE=off; go install gitlab.com/yawning/obfs4.git/obfs4proxy"
+      - ". /usr/lib/sdk/golang/enable.sh; export GOPATH=$PWD; export GO111MODULE=on; cd desktop && ./scripts/build-pt-obfs4proxy.sh && mv onionshare/resources/tor/obfs4proxy /app/bin/obfs4proxy"
    sources:
-      - type: git
-        url: https://go.googlesource.com/net
-        commit: 69e39bad7dc2bbb411fa35755c46020969029fa7
-        dest: src/golang.org/x/net
-      - type: git
-        url: https://go.googlesource.com/crypto
-        commit: ceb1ce70b4faafeeb5b3f23cc83f09b39a4f3f1d
-        dest: src/golang.org/x/crypto
-      - type: git
-        url: https://go.googlesource.com/text
-        commit: 18b340fc7af22495828ffbe71e9f9e22583bc7a9
-        dest: src/golang.org/x/text
-      - type: git
-        url: https://go.googlesource.com/sys
-        commit: faf0a1b62c6b439486fd1d914d8185627b99d387
-        dest: src/golang.org/x/sys
-      - type: git
-        url: https://gitlab.com/yawning/obfs4
-        commit: 336a71d6e4cfd2d33e9c57797828007ad74975e9
-        dest: src/gitlab.com/yawning/obfs4.git
-      - type: git
-        url: https://gitlab.com/yawning/utls
-        commit: f1bcf4b40e4596d0ccd1dbf8f3a9f4922f9759ca
-        dest: src/gitlab.com/yawning/utls.git
-      - type: git
-        url: https://gitlab.com/yawning/bsaes
-        commit: 0a714cd429ec754482b4001e918db30cd2094405
-        dest: src/gitlab.com/yawning/bsaes.git
-      - type: git
-        url: https://gitlab.com/yawning/edwards25519-extra
-        commit: def713fd18e464864613d2b55ef41a21df2c9493
-        dest: src/gitlab.com/yawning/edwards25519-extra.git
-      - type: git
-        url: https://github.com/FiloSottile/edwards25519
-        commit: 8c58ed0e35502a485538e4c5ec086070840f3410
-        dest: src/filippo.io/edwards25519
-      - type: git
-        url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib
-        commit: 13b7b3552e1eef32e4d8a2a7813f22488f91dc09
-        dest: src/git.torproject.org/pluggable-transports/goptlib.git
-      - type: git
-        url: https://github.com/dsnet/compress
-        commit: f66993602bf5da07ef49d35b08e7264ae9fe2b6e
-        dest: src/github.com/dsnet/compress
-      - type: git
-        url: https://github.com/dchest/siphash
-        commit: 991656ee3840f823396c2eb7f4a70d65dac06832
-        dest: src/github.com/dchest/siphash
+      - type: dir
+        path: ..
  - name: meek-client
    buildsystem: simple
    build-options:
-      env:
-        GOBIN: "/app/bin/"
+      build-args:
+        - --share=network
    build-commands:
-      - ". /usr/lib/sdk/golang/enable.sh; export GOPATH=$PWD; export GO111MODULE=off; go install git.torproject.org/pluggable-transports/meek.git/meek-client"
+      - ". /usr/lib/sdk/golang/enable.sh; export GOPATH=$PWD; export GO111MODULE=on; cd desktop && ./scripts/build-pt-meek.sh && mv onionshare/resources/tor/meek-client /app/bin/meek-client"
    sources:
-      - type: git
-        url: https://go.googlesource.com/net
-        commit: 69e39bad7dc2bbb411fa35755c46020969029fa7
-        dest: src/golang.org/x/net
-      - type: git
-        url: https://go.googlesource.com/crypto
-        commit: ceb1ce70b4faafeeb5b3f23cc83f09b39a4f3f1d
-        dest: src/golang.org/x/crypto
-      - type: git
-        url: https://go.googlesource.com/text
-        commit: 18b340fc7af22495828ffbe71e9f9e22583bc7a9
-        dest: src/golang.org/x/text
-      - type: git
-        url: https://go.googlesource.com/sys
-        commit: faf0a1b62c6b439486fd1d914d8185627b99d387
-        dest: src/golang.org/x/sys
-      - type: git
-        url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib
-        commit: 13b7b3552e1eef32e4d8a2a7813f22488f91dc09
-        dest: src/git.torproject.org/pluggable-transports/goptlib.git
-      - type: git
-        url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/meek
-        commit: 6600c52acb7979b08dd0916a7a779dd0e5dde0b0
-        dest: src/git.torproject.org/pluggable-transports/meek.git
-      - type: git
-        url: https://github.com/refraction-networking/utls
-        commit: 0b2885c8c0d4467cfe98136748a9d011d0b8fff0
-        dest: src/github.com/refraction-networking/utls
+      - type: dir
+        path: ..
  - name: snowflake-client
    buildsystem: simple
    build-options:
-      env:
-        GOBIN: "/app/bin/"
+      build-args:
+        - --share=network
    build-commands:
-      - ". /usr/lib/sdk/golang/enable.sh; export GOPATH=$PWD; export GO111MODULE=off; go install git.torproject.org/pluggable-transports/snowflake.git/client"
-      - "mv /app/bin/client /app/bin/snowflake-client"
+      - ". /usr/lib/sdk/golang/enable.sh; export GOPATH=$PWD; export GO111MODULE=on; cd desktop && ./scripts/build-pt-snowflake.sh && mv onionshare/resources/tor/snowflake-client /app/bin/snowflake-client"
    sources:
-      - type: git
-        url: https://go.googlesource.com/net
-        commit: 69e39bad7dc2bbb411fa35755c46020969029fa7
-        dest: src/golang.org/x/net
-      - type: git
-        url: https://go.googlesource.com/crypto
-        commit: ceb1ce70b4faafeeb5b3f23cc83f09b39a4f3f1d
-        dest: src/golang.org/x/crypto
-      - type: git
-        url: https://go.googlesource.com/text
-        commit: 18b340fc7af22495828ffbe71e9f9e22583bc7a9
-        dest: src/golang.org/x/text
-      - type: git
-        url: https://go.googlesource.com/sys
-        commit: faf0a1b62c6b439486fd1d914d8185627b99d387
-        dest: src/golang.org/x/sys
-      - type: git
-        url: https://go.googlesource.com/xerrors
-        commit: 5ec99f83aff198f5fbd629d6c8d8eb38a04218ca
-        dest: src/golang.org/x/xerrors
-      - type: git
-        url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib
-        commit: 13b7b3552e1eef32e4d8a2a7813f22488f91dc09
-        dest: src/git.torproject.org/pluggable-transports/goptlib.git
-      - type: git
-        url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake
-        commit: 36f03dfd4483922b3e7400dedc71df9cf2f30b6b
-        dest: src/git.torproject.org/pluggable-transports/snowflake.git
-      - type: git
-        url: https://github.com/refraction-networking/utls
-        commit: 0b2885c8c0d4467cfe98136748a9d011d0b8fff0
-        dest: src/github.com/refraction-networking/utls
-      - type: git
-        url: https://github.com/templexxx/xorsimd
-        commit: e2f34adfb57b524164fc712df2fcfd991ed0ccad
-        dest: src/github.com/templexxx/xorsimd
-      - type: git
-        url: https://github.com/templexxx/cpu
-        commit: 98168dcec14af3f8700bf309afe503bfe936e9f2
-        dest: src/github.com/templexxx/cpu
-      - type: git
-        url: https://github.com/google/uuid
-        commit: 44b5fee7c49cf3bcdf723f106b36d56ef13ccc88
-        dest: src/github.com/google/uuid
-      - type: git
-        url: https://github.com/pion/udp
-        commit: 68c2d469b1ffc77a8addab02c1e45c93b5d0071d
-        dest: src/github.com/pion/udp
-      - type: git
-        url: https://github.com/pion/dtls
-        commit: e4d311c89ca1b77c9fe928e6cbfc508c959a3e73
-        dest: src/github.com/pion/dtls
-      - type: git
-        url: https://github.com/pion/rtp
-        commit: 1bb23f70af626f56c785a0e1615da871f5a03129
-        dest: src/github.com/pion/rtp
-      - type: git
-        url: https://github.com/pion/stun
-        commit: fa0355cc10e886da31cdfffe5c67cc23d345bbdc
-        dest: src/github.com/pion/stun
-      - type: git
-        url: https://github.com/pion/randutil
-        commit: 3e7aefb6fd280d89fca72f1596348f1939525187
-        dest: src/github.com/pion/randutil
-      - type: git
-        url: https://github.com/pion/srtp
-        commit: 1d7627ee3ca0c5f9f3943d6fe92295dc0a2b8e69
-        dest: src/github.com/pion/srtp
-      - type: git
-        url: https://github.com/pion/sctp
-        commit: fd9945b6f0fe8785677b18df7ce3e9ec78f9d451
-        dest: src/github.com/pion/sctp
-      - type: git
-        url: https://github.com/pion/transport
-        commit: 33608e46f9f1fb5af237d9cf0df6126fa1b6b206
-        dest: src/github.com/pion/transport
-      - type: git
-        url: https://github.com/pion/logging
-        commit: b0e968691909fdc8f198d1be221624b74b397fa6
-        dest: src/github.com/pion/logging
-      - type: git
-        url: https://github.com/pion/datachannel
-        commit: 74e13972527c0130d4245897fef9c300a091b14b
-        dest: src/github.com/pion/datachannel
-      - type: git
-        url: https://github.com/pion/interceptor
-        commit: 75c3df4712798c9e6fbec8a41059cc5b2913c032
-        dest: src/github.com/pion/interceptor
-      - type: git
-        url: https://github.com/pion/ice
-        commit: d5db22342061ee429c247141700b1e02e73acf54
-        dest: src/github.com/pion/ice
-      - type: git
-        url: https://github.com/pion/webrtc
-        commit: 635bfd9cad37eff2d2b7004e303ca4d509b8de17
-        dest: src/github.com/pion/webrtc
-      - type: git
-        url: https://github.com/pion/mdns
-        commit: 9db0fe207a1804f909cd53dd8f6cc36311ea65d6
-        dest: src/github.com/pion/mdns
-      - type: git
-        url: https://github.com/pion/turn
-        commit: 72ffd594f7c6104b5680a4fea5651928e3b6ddb4
-        dest: src/github.com/pion/turn
-      - type: git
-        url: https://github.com/pion/rtcp
-        commit: 516927b4081bb24ad1e2778d4627f90529e3105e
-        dest: src/github.com/pion/rtcp
-      - type: git
-        url: https://github.com/pion/sdp
-        commit: 9f8ec15f7bbb128c4625b3c07ab7923831533518
-        dest: src/github.com/pion/sdp
-      - type: git
-        url: https://github.com/tjfoc/gmsm
-        commit: fdaa5ff368db5ce62bb672fc424b23f8923858dc
-        dest: src/github.com/tjfoc/gmsm
-      - type: git
-        url: https://github.com/xtaci/kcp-go
-        commit: bd59cf8a523bbf67e55024a164d419a32de9de39
-        dest: src/github.com/xtaci/kcp-go
-      - type: git
-        url: https://github.com/xtaci/smux
-        commit: "09e2c01560df5aaaed50e48e77547858e2623498"
-        dest: src/github.com/xtaci/smux
-      - type: git
-        url: https://github.com/klauspost/cpuid
-        commit: cffd0d4c86d45f8de353e162651c92fa263e845d
-        dest: src/github.com/klauspost/cpuid
-      - type: git
-        url: https://github.com/klauspost/reedsolomon
-        commit: 0eef97bb02ee165a0d7b42a5989502bfa40f6ba0
-        dest: src/github.com/klauspost/reedsolomon
-      - type: git
-        url: https://github.com/pkg/errors
-        commit: 5dd12d0cfe7f152f80558d591504ce685299311e
-        dest: src/github.com/pkg/errors
+      - type: dir
+        path: ..
  - name: onionshare
    buildsystem: simple
    ensure-writable:
@ -331,14 +124,14 @@ modules:
            buildsystem: simple
            build-commands:
              - pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}"
-                --prefix=${FLATPAK_DEST} "werkzeug" --no-build-isolation
+                --prefix=${FLATPAK_DEST} "werkzeug==3.0.6" --no-build-isolation
            sources:
              - type: file
                url: https://files.pythonhosted.org/packages/b2/97/5d42485e71dfc078108a86d6de8fa46db44a1a9295e89c5d6d4a06e23a62/markupsafe-3.0.2.tar.gz
                sha256: ee55d3edf80167e48ea11a923c7386f4669df67d7994554387f84e7d8b0a2bf0
              - type: file
-                url: https://files.pythonhosted.org/packages/52/24/ab44c871b0f07f491e5d2ad12c9bd7358e527510618cb1b803a88e986db1/werkzeug-3.1.3-py3-none-any.whl
-                sha256: 54b78bf3716d19a65be4fceccc0d1d7b89e608834989dfae50ea87564639213e
+                url: https://files.pythonhosted.org/packages/6c/69/05837f91dfe42109203ffa3e488214ff86a6d68b2ed6c167da6cdc42349b/werkzeug-3.0.6-py3-none-any.whl
+                sha256: 1bc0c2310d2fbb07b1dd1105eba2f7af72f322e1e455f2f93c993bee8c8a5f17
          - name: python3-python-gnupg
            buildsystem: simple
            build-commands:
@ -385,8 +178,8 @@ modules:
                url: https://files.pythonhosted.org/packages/95/9d/70caa61192f570fcf0352766331b735afa931b4c6bc9a348a0925cc13288/brotlicffi-1.1.0.0.tar.gz
                sha256: b77827a689905143f87915310b93b273ab17888fd43ef350d4832c4a71083c13
              - type: file
-                url: https://files.pythonhosted.org/packages/ba/06/a07f096c664aeb9f01624f858c3add0a4e913d6c96257acb4fce61e7de14/certifi-2024.2.2-py3-none-any.whl
-                sha256: dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1
+                url: https://files.pythonhosted.org/packages/38/fc/bce832fd4fd99766c04d1ee0eead6b0ec6486fb100ae5e74c1d91292b982/certifi-2025.1.31-py3-none-any.whl
+                sha256: ca78db4565a652026a4db2bcdf68f2fb589ea80d0be70e03929ed730746b84fe
              - type: file
                url: https://files.pythonhosted.org/packages/68/ce/95b0bae7968c65473e1298efb042e10cafc7bafc14d9e4f154008241c91d/cffi-1.16.0.tar.gz
                sha256: bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0
@ -403,11 +196,11 @@ modules:
                url: https://files.pythonhosted.org/packages/e3/7f/f584f5d15323feb897d42ef0e9d910649e2150d7a30cf7e7a8cc1d236e6f/Cython-3.0.8-py2.py3-none-any.whl
                sha256: 171b27051253d3f9108e9759e504ba59ff06e7f7ba944457f94deaf9c21bf0b6
              - type: file
-                url: https://files.pythonhosted.org/packages/b6/83/4a684a63d395007670bc95c1947c07045fe66141574e2f7e9e347df8499a/dnspython-2.5.0-py3-none-any.whl
-                sha256: 6facdf76b73c742ccf2d07add296f178e629da60be23ce4b0a9c927b1e02c3a6
+                url: https://files.pythonhosted.org/packages/68/1b/e0a87d256e40e8c888847551b20a017a6b98139178505dc7ffb96f04e954/dnspython-2.7.0-py3-none-any.whl
+                sha256: b4c34b7d10b51bcc3a5071e7b8dee77939f1e878477eeecc965e9835f63c6c86
              - type: file
-                url: https://files.pythonhosted.org/packages/44/d2/2f3da64a54d247b8504f644a42163deb5d28b3c57719eb6acc9932734c20/eventlet-0.35.1-py3-none-any.whl
-                sha256: 7ed9493b26e02f575f4804ef263190839e9651989523f6f8f9c2866a05c12c83
+                url: https://files.pythonhosted.org/packages/8d/08/f086fa53ff8092a72b7922d51838b85d6b5751b439469767690d56843879/eventlet-0.39.0-py3-none-any.whl
+                sha256: 9522ca09ad4c1f874c238f06492a7e217ddb13bdeace4475d3b700dd0ba1f6be
              - type: file
                url: https://files.pythonhosted.org/packages/b8/9a/5028fd52db10e600f1c4674441b968cf2ea4959085bfb5b99fb1250e5f68/exceptiongroup-1.2.0-py3-none-any.whl
                sha256: 4bfd3996ac73b41e9b9628b04e079f193850720ea5945fc96a08633c66912f14
@ -433,8 +226,8 @@ modules:
                url: https://files.pythonhosted.org/packages/95/04/ff642e65ad6b90db43e668d70ffb6736436c7ce41fcc549f4e9472234127/h11-0.14.0-py3-none-any.whl
                sha256: e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761
              - type: file
-                url: https://files.pythonhosted.org/packages/c2/e7/a82b05cf63a603df6e68d59ae6a68bf5064484a0718ea5033660af4b54a9/idna-3.6-py3-none-any.whl
-                sha256: c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f
+                url: https://files.pythonhosted.org/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl
+                sha256: 946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3
              - type: file
                url: https://files.pythonhosted.org/packages/c0/8b/d8427f023c081a8303e6ac7209c16e6878f2765d5b59667f3903fbcfd365/importlib_metadata-7.0.1-py3-none-any.whl
                sha256: 4805911c3a4ec7c3966410053e9ec6a1fecd629117df5adee56dfc9432a1081e
@ -445,8 +238,8 @@ modules:
                url: https://files.pythonhosted.org/packages/68/5f/447e04e828f47465eeab35b5d408b7ebaaaee207f48b7136c5a7267a30ae/itsdangerous-2.1.2-py3-none-any.whl
                sha256: 2c2349112351b88699d8d4b6b075022c0808887cb7ad10069318a8b0bc88db44
              - type: file
-                url: https://files.pythonhosted.org/packages/30/6d/6de6be2d02603ab56e72997708809e8a5b0fbfee080735109b40a3564843/Jinja2-3.1.3-py3-none-any.whl
-                sha256: 7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa
+                url: https://files.pythonhosted.org/packages/bd/0f/2ba5fbcd631e3e88689309dbe978c5769e883e4b84ebfe7da30b43275c5a/jinja2-3.1.5-py3-none-any.whl
+                sha256: aba0f4dc9ed8013c424088f68a5c226f7d6097ed89b246d7749c2ec4175c6adb
              - type: file
                url: https://files.pythonhosted.org/packages/87/5b/aae44c6655f3801e81aa3eef09dbbf012431987ba564d7231722f68df02d/MarkupSafe-2.1.5.tar.gz
                sha256: d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b
@ -484,8 +277,8 @@ modules:
                url: https://files.pythonhosted.org/packages/24/79/aaf0c1c7214f2632badb2771d770b1500d3d7cbdf2590ae62e721ec50584/qrcode-7.4.2-py3-none-any.whl
                sha256: 581dca7a029bcb2deef5d01068e39093e80ef00b4a61098a2182eac59d01643a
              - type: file
-                url: https://files.pythonhosted.org/packages/70/8e/0e2d847013cb52cd35b38c009bb167a1a26b2ce6cd6965bf26b47bc0bf44/requests-2.31.0-py3-none-any.whl
-                sha256: 58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f
+                url: https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl
+                sha256: 70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
              - type: file
                url: https://files.pythonhosted.org/packages/bb/0a/203797141ec9727344c7649f6d5f6cf71b89a6c28f8f55d4f18de7a1d352/setuptools-69.1.0-py3-none-any.whl
                sha256: c054629b81b946d63a9c6e732bc8b2513a7c3ea645f11d0139a2191d735c60c6
@ -505,14 +298,14 @@ modules:
                url: https://files.pythonhosted.org/packages/84/b7/6ec57841fb67c98f52fc8e4a2d96df60059637cba077edc569a302a8ffc7/Unidecode-1.3.8-py3-none-any.whl
                sha256: d130a61ce6696f8148a3bd8fe779c99adeb4b870584eeb9526584e9aa091fd39
              - type: file
-                url: https://files.pythonhosted.org/packages/88/75/311454fd3317aefe18415f04568edc20218453b709c63c58b9292c71be17/urllib3-2.2.0-py3-none-any.whl
-                sha256: ce3711610ddce217e6d113a2732fafad960a03fd0318c91faa79481e35c11224
+                url: https://files.pythonhosted.org/packages/c8/19/4ec628951a74043532ca2cf5d97b7b14863931476d117c471e8e2b1eb39f/urllib3-2.3.0-py3-none-any.whl
+                sha256: 1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df
              - type: file
-                url: https://files.pythonhosted.org/packages/58/6a/b4b5c582e04e837e4422cab6ec9de7fc10ca7ad7f4e370bb89d280d39552/waitress-2.1.2-py3-none-any.whl
-                sha256: 7500c9625927c8ec60f54377d590f67b30c8e70ef4b8894214ac6e4cad233d2a
+                url: https://files.pythonhosted.org/packages/8d/57/a27182528c90ef38d82b636a11f606b0cbb0e17588ed205435f8affe3368/waitress-3.0.2-py3-none-any.whl
+                sha256: c56d67fd6e87c2ee598b76abdd4e96cfad1f24cacdea5078d382b1f9d7b5ed2e
              - type: file
-                url: https://files.pythonhosted.org/packages/c3/fc/254c3e9b5feb89ff5b9076a23218dafbc99c96ac5941e900b71206e6313b/werkzeug-3.0.1-py3-none-any.whl
-                sha256: 90a285dc0e42ad56b34e696398b8122ee4c681833fb35b8334a095d82c56da10
+                url: https://files.pythonhosted.org/packages/6c/69/05837f91dfe42109203ffa3e488214ff86a6d68b2ed6c167da6cdc42349b/werkzeug-3.0.6-py3-none-any.whl
+                sha256: 1bc0c2310d2fbb07b1dd1105eba2f7af72f322e1e455f2f93c993bee8c8a5f17
              - type: file
                url: https://files.pythonhosted.org/packages/fa/7f/4c07234086edbce4a0a446209dc0cb08a19bb206a3ea53b2f56a403f983b/wheel-0.41.3-py3-none-any.whl
                sha256: 488609bc63a29322326e05560731bf7bfea8e48ad646e1f5e40d366607de0942
@ -520,8 +313,8 @@ modules:
                url: https://files.pythonhosted.org/packages/78/58/e860788190eba3bcce367f74d29c4675466ce8dddfba85f7827588416f01/wsproto-1.2.0-py3-none-any.whl
                sha256: b9acddd652b585d75b20477888c56642fdade28bdfd3579aa24a4d2c037dd736
              - type: file
-                url: https://files.pythonhosted.org/packages/d9/66/48866fc6b158c81cc2bfecc04c480f105c6040e8b077bc54c634b4a67926/zipp-3.17.0-py3-none-any.whl
-                sha256: 0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31
+                url: https://files.pythonhosted.org/packages/b7/1a/7e4798e9339adc931158c9d69ecc34f5e6791489d469f5e50ec15e35f458/zipp-3.21.0-py3-none-any.whl
+                sha256: ac1bbe05fd2991f160ebce24ffbac5f6d11d83dc90891255885223d42b3cd931
              - type: file
                url: https://files.pythonhosted.org/packages/fe/42/f8dbc2b9ad59e927940325a22d6d3931d630c3644dae7e2369ef5d9ba230/zope.event-5.0-py3-none-any.whl
                sha256: 2832e95014f4db26c47a13fdaef84cef2f4df37e66b59d8f1f4a8f319a632c26
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@ -177,8 +177,8 @@ parts:
    after: [onionshare-cli]

  tor:
-    source: https://dist.torproject.org/tor-0.4.8.9.tar.gz
-    source-checksum: sha256/59bb7d8890f6131b4ce5344f3dcea5deb2182b7f4f10ff0cb4e4d81f11b2cf65
+    source: https://dist.torproject.org/tor-0.4.8.13.tar.gz
+    source-checksum: sha256/9baf26c387a2820b3942da572146e6eb77c2bc66862af6297cd02a074e6fba28
    source-type: tar
    plugin: autotools
    autotools-configure-parameters:
@ -208,7 +208,7 @@ parts:
      - go/latest/stable
    source: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git
    source-type: git
-    source-tag: v2.8.1
+    source-tag: v2.10.1
    organize:
      bin/client: bin/snowflake-client