Merge branch 'develop' into v2.6-dev2

snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: onionshare
-base: core18
+base: core20
 version: "2.6"
 summary: Securely and anonymously share files, host websites, and chat using Tor
 description: |
@@ -11,11 +11,16 @@ description: |
 grade: stable # stable or devel
 confinement: strict
 
+architectures:
+- build-on: amd64
+- build-on: arm64
+- build-on: armhf
+
 apps:
   onionshare:
     common-id: org.onionshare.OnionShare
     command: onionshare
-    extensions: [gnome-3-34]
+    extensions: [gnome-3-38]
     plugs:
       - desktop
       - home
@@ -43,9 +48,8 @@ parts:
     python-version: python3
     python-packages:
       - setuptools
-      - psutil
       - qrcode
-      - pyside2 == 5.15.2
+      - pyside2 == 5.15.2.1
     # Force using setup.py, prevent using setup-freeze.py or poetry
     override-build: |
       rm setup-freeze.py pyproject.toml poetry.lock || true
@@ -132,8 +136,8 @@ parts:
     after: [tor, obfs4, snowflake-client, meek-client]
 
   tor:
-    source: https://dist.torproject.org/tor-0.4.6.9.tar.gz
-    source-checksum: sha256/c7e93380988ce20b82aa19c06cdb2f10302b72cfebec7c15b5b96bcfc94ca9a9
+    source: https://dist.torproject.org/tor-0.4.7.8.tar.gz
+    source-checksum: sha256/9e9a5c67ad2acdd5f0f8be14ed591fed076b1708abf8344066990a0fa66fe195
     source-type: tar
     plugin: autotools
     build-packages:
@@ -158,7 +162,7 @@ parts:
     go-importpath: git.torproject.org/pluggable-transports/snowflake.git/client
     source: https://git.torproject.org/pluggable-transports/snowflake.git
     source-type: git
-    source-tag: v2.0.1
+    source-tag: v2.2.0
     organize:
       bin/client: bin/snowflake-client