Write unified release documentation, move licenses into the root, and delete some unnecessary files from desktop/install

19 files changed, 169 insertions, 2253 deletions

diff --git a/desktop/README.md b/desktop/README.md
index 7b8251d7..8d72f22f 100644
--- a/desktop/README.md
+++ b/desktop/README.md
@@ -17,7 +17,7 @@ If you're using Linux, install `tor` and `obfs4proxy` from either the [official
 
 #### macOS
 
-Download and install Python 3.9.0 from https://www.python.org/downloads/release/python-390/. I downloaded `python-3.9.0-macosx10.9.pkg`. (You may need to also run `/Applications/Python\ 3.9/Install\ Certificates.command`.)
+Download and install Python 3.8.6 from https://www.python.org/downloads/release/python-386/. I downloaded `python-3.8.6-macosx10.9.pkg`. (You may need to also run `/Applications/Python\ 3.8/Install\ Certificates.command`.)
 
 Install some python dependencies:
 
@@ -106,92 +106,3 @@ If you want to run tests while hiding the GUI, you must have the `xvfb` package
 ```sh
 xvfb-run ./tests/run.sh
 ```
-
-## Making a release
-
-Before making a release, update the version in these places:
-
-- `pyproject.toml`
-- `src/setup.py`
-
-### Flatpak packaging
-
-See: https://github.com/micahflee/org.onionshare.OnionShare
-
-### Snapcraft packaging
-
-This folder contains files to build a [snap package](https://snapcraft.io/). First make sure you install `snap` and `snapcraft` (`snap install snapcraft --classic`).
-
-Build and install the snap::
-
-```sh
-snapcraft
-snap install --devmode ./onionshare_*.snap
-``
-
-Run the OnionShare snap:
-
-```sh
-/snap/bin/onionshare     # GUI version
-/snap/bin/onionshare.cli # CLI version
-```
-
-Delete the snap:
-
-```sh
-snap remove onionshare
-```
-
-### Linux
-
-Build a wheel package for OnionShare CLI:
-
-```sh
-cd onionshare/cli
-poetry install
-poetry build
-```
-
-This will make a file like `dist/onionshare_cli-$VERSION-py3-none-any.whl` (except with your specific version number). Move it into `../desktop/linux`:
-
-```
-mkdir -p ../desktop/linux
-mv dist/onionshare_cli-*-py3-none-any.whl ../desktop/linux
-# change back to the desktop directory
-cd ../desktop
-```
-
-Make sure the virtual environment is active, and then run `briefcase create` and `briefcase build`:
-
-```sh
-. venv/bin/activate
-briefcase create
-briefcase build
-```
-
-### Windows
-
-Build a wheel package for OnionShare CLI (including Tor binaries, from Tor Browser):
-
-```sh
-cd onionshare\cli
-poetry install
-poetry build
-```
-
-This will make a file like `dist\onionshare_cli-$VERSION-py3-none-any.whl` (except with your specific version number). Move it into `..\desktop`:
-
-```
-move dist\onionshare_cli-*-py3-none-any.whl ..\desktop
-cd ..\desktop
-```
-
-Make sure the virtual environment is active, and then run `briefcase create`:
-
-```sh
-venv\Scripts\activate.bat
-briefcase create
-briefcase package
-```
-
-TODO: Codesign
\ No newline at end of file
diff --git a/desktop/include/site/python3.8/greenlet/greenlet.h b/desktop/include/site/python3.8/greenlet/greenlet.h
new file mode 100644
index 00000000..d68160b5
--- /dev/null
+++ b/desktop/include/site/python3.8/greenlet/greenlet.h
@@ -0,0 +1,168 @@
+/* vim:set noet ts=8 sw=8 : */
+
+/* Greenlet object interface */
+
+#ifndef Py_GREENLETOBJECT_H
+#define Py_GREENLETOBJECT_H
+
+#include <Python.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define GREENLET_VERSION "0.4.17"
+
+#if PY_VERSION_HEX >= 0x030700A3
+#  define GREENLET_USE_EXC_INFO
+#endif
+
+#ifndef GREENLET_USE_CONTEXT_VARS
+#ifdef Py_CONTEXT_H
+#define GREENLET_USE_CONTEXT_VARS 1
+#else
+#define GREENLET_USE_CONTEXT_VARS 0
+#endif
+#endif
+
+typedef struct _greenlet {
+	PyObject_HEAD
+	char* stack_start;
+	char* stack_stop;
+	char* stack_copy;
+	intptr_t stack_saved;
+	struct _greenlet* stack_prev;
+	struct _greenlet* parent;
+	PyObject* run_info;
+	struct _frame* top_frame;
+	int recursion_depth;
+	PyObject* weakreflist;
+#ifdef GREENLET_USE_EXC_INFO
+	_PyErr_StackItem* exc_info;
+	_PyErr_StackItem exc_state;
+#else
+	PyObject* exc_type;
+	PyObject* exc_value;
+	PyObject* exc_traceback;
+#endif
+	PyObject* dict;
+#if GREENLET_USE_CONTEXT_VARS
+	PyObject* context;
+#endif
+} PyGreenlet;
+
+#define PyGreenlet_Check(op)      PyObject_TypeCheck(op, &PyGreenlet_Type)
+#define PyGreenlet_MAIN(op)       (((PyGreenlet*)(op))->stack_stop == (char*) -1)
+#define PyGreenlet_STARTED(op)    (((PyGreenlet*)(op))->stack_stop != NULL)
+#define PyGreenlet_ACTIVE(op)     (((PyGreenlet*)(op))->stack_start != NULL)
+#define PyGreenlet_GET_PARENT(op) (((PyGreenlet*)(op))->parent)
+
+#if (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 7) || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 1) || PY_MAJOR_VERSION > 3
+#define GREENLET_USE_PYCAPSULE
+#endif
+
+/* C API functions */
+
+/* Total number of symbols that are exported */
+#define PyGreenlet_API_pointers  8
+
+#define PyGreenlet_Type_NUM       0
+#define PyExc_GreenletError_NUM   1
+#define PyExc_GreenletExit_NUM    2
+
+#define PyGreenlet_New_NUM        3
+#define PyGreenlet_GetCurrent_NUM 4
+#define PyGreenlet_Throw_NUM      5
+#define PyGreenlet_Switch_NUM     6
+#define PyGreenlet_SetParent_NUM  7
+
+#ifndef GREENLET_MODULE
+/* This section is used by modules that uses the greenlet C API */
+static void **_PyGreenlet_API = NULL;
+
+#define PyGreenlet_Type (*(PyTypeObject *) _PyGreenlet_API[PyGreenlet_Type_NUM])
+
+#define PyExc_GreenletError \
+	((PyObject *) _PyGreenlet_API[PyExc_GreenletError_NUM])
+
+#define PyExc_GreenletExit \
+	((PyObject *) _PyGreenlet_API[PyExc_GreenletExit_NUM])
+
+/*
+ * PyGreenlet_New(PyObject *args)
+ *
+ * greenlet.greenlet(run, parent=None)
+ */
+#define PyGreenlet_New \
+	(* (PyGreenlet * (*)(PyObject *run, PyGreenlet *parent)) \
+	 _PyGreenlet_API[PyGreenlet_New_NUM])
+
+/*
+ * PyGreenlet_GetCurrent(void)
+ *
+ * greenlet.getcurrent()
+ */
+#define PyGreenlet_GetCurrent \
+	(* (PyGreenlet * (*)(void)) _PyGreenlet_API[PyGreenlet_GetCurrent_NUM])
+
+/*
+ * PyGreenlet_Throw(
+ *         PyGreenlet *greenlet,
+ *         PyObject *typ,
+ *         PyObject *val,
+ *         PyObject *tb)
+ *
+ * g.throw(...)
+ */
+#define PyGreenlet_Throw \
+	(* (PyObject * (*) \
+	    (PyGreenlet *self, PyObject *typ, PyObject *val, PyObject *tb)) \
+	 _PyGreenlet_API[PyGreenlet_Throw_NUM])
+
+/*
+ * PyGreenlet_Switch(PyGreenlet *greenlet, PyObject *args)
+ *
+ * g.switch(*args, **kwargs)
+ */
+#define PyGreenlet_Switch \
+	(* (PyObject * (*)(PyGreenlet *greenlet, PyObject *args, PyObject *kwargs)) \
+	 _PyGreenlet_API[PyGreenlet_Switch_NUM])
+
+/*
+ * PyGreenlet_SetParent(PyObject *greenlet, PyObject *new_parent)
+ *
+ * g.parent = new_parent
+ */
+#define PyGreenlet_SetParent \
+	(* (int (*)(PyGreenlet *greenlet, PyGreenlet *nparent)) \
+	 _PyGreenlet_API[PyGreenlet_SetParent_NUM])
+
+/* Macro that imports greenlet and initializes C API */
+#ifdef GREENLET_USE_PYCAPSULE
+#define PyGreenlet_Import() \
+{ \
+	_PyGreenlet_API = (void**)PyCapsule_Import("greenlet._C_API", 0); \
+}
+#else
+#define PyGreenlet_Import() \
+{ \
+	PyObject *module = PyImport_ImportModule("greenlet"); \
+	if (module != NULL) { \
+		PyObject *c_api_object = PyObject_GetAttrString( \
+			module, "_C_API"); \
+		if (c_api_object != NULL && PyCObject_Check(c_api_object)) { \
+			_PyGreenlet_API = \
+				(void **) PyCObject_AsVoidPtr(c_api_object); \
+			Py_DECREF(c_api_object); \
+		} \
+		Py_DECREF(module); \
+	} \
+}
+#endif
+
+#endif /* GREENLET_MODULE */
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_GREENLETOBJECT_H */
diff --git a/desktop/install/build_deb.sh b/desktop/install/build_deb.sh
deleted file mode 100755
index aec026a4..00000000
--- a/desktop/install/build_deb.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
-cd $DIR
-
-VERSION=`cat share/version.txt`
-
-# clean up from last build
-rm -r deb_dist >/dev/null 2>&1
-
-# build binary package
-python3 setup.py --command-packages=stdeb.command bdist_deb
-
-# return install instructions if onionshare builds properly
-if [[ $? -eq 0 ]]; then
-	# The build process in stdeb's util.py renames .dev to ~dev
-	# Adjust it here for the purposes of displaying the right filename
-	VERSION="${VERSION/.dev/~dev}"
-	echo ""
-	echo "To install, run:"
-	echo "sudo dpkg -i deb_dist/onionshare_$VERSION-1_all.deb"
-else
-	echo "OnionShare failed to build!"
-	exit 1
-fi
diff --git a/desktop/install/build_exe.bat b/desktop/install/build_exe.bat
deleted file mode 100644
index ba626fa2..00000000
--- a/desktop/install/build_exe.bat
+++ /dev/null
@@ -1,17 +0,0 @@
-REM delete old dist files

-rmdir /s /q dist

-

-REM build onionshare-gui.exe

-pyinstaller install\pyinstaller.spec -y

-

-REM download tor

-python install\get-tor-windows.py

-

-REM sign onionshare-gui.exe

-signtool.exe sign /v /d "OnionShare" /a /tr http://time.certum.pl/ dist\onionshare\onionshare-gui.exe

-

-REM build an installer, dist\onionshare-setup.exe

-makensis.exe install\onionshare.nsi

-

-REM sign onionshare-setup.exe

-signtool.exe sign /v /d "OnionShare" /a /tr http://time.certum.pl/ dist\onionshare-setup.exe

diff --git a/desktop/install/build_osx.sh b/desktop/install/build_osx.sh
deleted file mode 100755
index 9d286591..00000000
--- a/desktop/install/build_osx.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
-cd $ROOT
-
-# deleting dist
-echo Deleting dist folder
-rm -rf $ROOT/dist &>/dev/null 2>&1
-
-# build the .app
-echo Building OnionShare.app
-pyinstaller $ROOT/install/pyinstaller.spec
-python3 $ROOT/install/get-tor-osx.py
-
-# create a symlink of onionshare-gui called onionshare, for the CLI version
-cd $ROOT/dist/OnionShare.app/Contents/MacOS
-ln -s onionshare-gui onionshare
-cd $ROOT
-
-if [ "$1" = "--release" ]; then
-  mkdir -p dist
-  APP_PATH="$ROOT/dist/OnionShare.app"
-  IDENTITY_NAME_APPLICATION="Developer ID Application: Micah Lee (N9B95FDWH4)"
-  ENTITLEMENTS_CHILD_PATH="$ROOT/install/macos_sandbox/child.plist"
-  ENTITLEMENTS_PARENT_PATH="$ROOT/install/macos_sandbox/parent.plist"
-
-  echo "Codesigning the app bundle"
-  codesign \
-    --deep \
-    -s "$IDENTITY_NAME_APPLICATION" \
-    -o runtime \
-    --force \
-    --entitlements "$ENTITLEMENTS_CHILD_PATH" \
-    --timestamp \
-    "$APP_PATH"
-  codesign \
-    -s "$IDENTITY_NAME_APPLICATION" \
-    -o runtime \
-    --force \
-    --entitlements "$ENTITLEMENTS_PARENT_PATH" \
-    --timestamp \
-    "$APP_PATH"
-
-  echo "Create the DMG"
-  if [ ! -f "/usr/local/bin/create-dmg" ]; then
-    echo "Error: create-dmg is not installed"
-    exit 0
-  fi
-  /usr/local/bin/create-dmg "$APP_PATH" --identity "$IDENTITY_NAME_APPLICATION"
-  mv *.dmg dist
-
-  echo "Cleaning up"
-  rm -rf "$APP_PATH"
-
-  echo "All done, your DMG is in:"
-  ls dist/*.dmg
-fi
diff --git a/desktop/install/build_rpm.sh b/desktop/install/build_rpm.sh
deleted file mode 100755
index 145f0a3c..00000000
--- a/desktop/install/build_rpm.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
-cd $DIR
-
-VERSION=`cat share/version.txt`
-
-# clean up from last build
-rm -r build dist >/dev/null 2>&1
-
-# build binary package
-python3 setup.py bdist_rpm --requires="python3-flask, python3-flask-httpauth, python3-stem, python3-qt5, python3-crypto, python3-pysocks, nautilus-python, tor, obfs4, python3-psutil, python3-socketio, python3-flask-socketio, python3-qrcode"
-
-# install it
-echo ""
-echo "To install, run:"
-echo "sudo dnf install dist/onionshare-$VERSION-1.noarch.rpm"
diff --git a/desktop/install/build_source.sh b/desktop/install/build_source.sh
deleted file mode 100755
index d7f48722..00000000
--- a/desktop/install/build_source.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-
-# The script builds a source package
-# See https://github.com/micahflee/onionshare/blob/develop/BUILD.md#source-package
-
-# Usage
-display_usage() {
-	echo "Usage: $0 [tag]"
-}
-
-if [ $# -lt 1 ]
-then
-  display_usage
-  exit 1
-fi
-
-# Input validation
-TAG=$1
-
-if [ "${TAG:0:1}" != "v" ]
-then
-  echo "Tag must start with 'v' character"
-  exit 1
-fi
-
-VERSION=${TAG:1}
-
-# Make sure tag exists
-git tag | grep "^$TAG\$"
-if [ $? -ne 0 ]
-then
-  echo "Tag does not exist"
-  exit 1
-fi
-
-# Clone source
-mkdir -p build/source
-mkdir -p dist
-cd build/source
-git clone https://github.com/micahflee/onionshare.git
-cd onionshare
-
-# Verify tag
-git tag -v $TAG 2> ../verify.txt
-if [ $? -ne 0 ]
-then
-  echo "Tag does not verify"
-  exit 1
-fi
-cat ../verify.txt |grep "using RSA key 927F419D7EC82C2F149C1BD1403C2657CD994F73"
-if [ $? -ne 0 ]
-then
-  echo "Tag signed with wrong key"
-  exit 1
-fi
-cat ../verify.txt |grep "^gpg: Good signature from"
-if [ $? -ne 0 ]
-then
-  echo "Tag verification missing 'Good signature from'"
-  exit 1
-fi
-
-# Checkout code
-git checkout $TAG
-
-# Delete .git, compress, and PGP sign
-cd ..
-rm -rf onionshare/.git
-tar -cf onionshare-$VERSION.tar.gz onionshare/
-gpg -a --detach-sign onionshare-$VERSION.tar.gz
-
-# Move source package to dist
-cd ../..
-mv build/source/onionshare-$VERSION.tar.gz dist
-mv build/source/onionshare-$VERSION.tar.gz.asc dist
-
-# Clean up
-rm -rf build/source/onionshare
-rm build/source/verify.txt
-
-echo "Source package complete, files are in dist"
diff --git a/desktop/install/get-tor-osx.py b/desktop/install/get-tor-osx.py
deleted file mode 100644
index a05870f2..00000000
--- a/desktop/install/get-tor-osx.py
+++ /dev/null
@@ -1,126 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-OnionShare | https://onionshare.org/
-
-Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-"""
-This script downloads a pre-built tor binary to bundle with OnionShare.
-In order to avoid a Mac gnupg dependency, I manually verify the signature
-and hard-code the sha256 hash.
-"""
-
-import inspect
-import os
-import sys
-import hashlib
-import zipfile
-import io
-import shutil
-import subprocess
-import requests
-
-
-def main():
-    dmg_url = "https://archive.torproject.org/tor-package-archive/torbrowser/10.0/TorBrowser-10.0-osx64_en-US.dmg"
-    dmg_filename = "TorBrowser-10.0-osx64_en-US.dmg"
-    expected_dmg_sha256 = (
-        "4e1ca7068bc29d5e8ffba85ecc8fec36c52ae582faea67bcdf445cd57192fb08"
-    )
-
-    # Build paths
-    root_path = os.path.dirname(
-        os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
-    )
-    working_path = os.path.join(root_path, "build", "tor")
-    dmg_tor_path = os.path.join(
-        "/Volumes", "Tor Browser", "Tor Browser.app", "Contents"
-    )
-    dmg_path = os.path.join(working_path, dmg_filename)
-    dist_path = os.path.join(root_path, "dist", "OnionShare.app", "Contents")
-
-    # Make sure the working folder exists
-    if not os.path.exists(working_path):
-        os.makedirs(working_path)
-
-    # Make sure the zip is downloaded
-    if not os.path.exists(dmg_path):
-        print("Downloading {}".format(dmg_url))
-        r = requests.get(dmg_url)
-        open(dmg_path, "wb").write(r.content)
-        dmg_sha256 = hashlib.sha256(r.content).hexdigest()
-    else:
-        dmg_data = open(dmg_path, "rb").read()
-        dmg_sha256 = hashlib.sha256(dmg_data).hexdigest()
-
-    # Compare the hash
-    if dmg_sha256 != expected_dmg_sha256:
-        print("ERROR! The sha256 doesn't match:")
-        print("expected: {}".format(expected_dmg_sha256))
-        print("  actual: {}".format(dmg_sha256))
-        sys.exit(-1)
-
-    # Mount the dmg, copy data to the working path
-    subprocess.call(["hdiutil", "attach", dmg_path])
-
-    # Make sure Resources/tor exists before copying files
-    if os.path.exists(os.path.join(dist_path, "Resources", "Tor")):
-        shutil.rmtree(os.path.join(dist_path, "Resources", "Tor"))
-    os.makedirs(os.path.join(dist_path, "Resources", "Tor"))
-    if os.path.exists(os.path.join(dist_path, "MacOS", "Tor")):
-        shutil.rmtree(os.path.join(dist_path, "MacOS", "Tor"))
-    os.makedirs(os.path.join(dist_path, "MacOS", "Tor"))
-
-    # Modify the tor script to adjust the path
-    tor_script = open(
-        os.path.join(dmg_tor_path, "Resources", "TorBrowser", "Tor", "tor"), "r"
-    ).read()
-    tor_script = tor_script.replace("../../../MacOS/Tor", "../../MacOS/Tor")
-    open(os.path.join(dist_path, "Resources", "Tor", "tor"), "w").write(tor_script)
-
-    # Copy into dist
-    shutil.copyfile(
-        os.path.join(dmg_tor_path, "Resources", "TorBrowser", "Tor", "geoip"),
-        os.path.join(dist_path, "Resources", "Tor", "geoip"),
-    )
-    shutil.copyfile(
-        os.path.join(dmg_tor_path, "Resources", "TorBrowser", "Tor", "geoip6"),
-        os.path.join(dist_path, "Resources", "Tor", "geoip6"),
-    )
-    os.chmod(os.path.join(dist_path, "Resources", "Tor", "tor"), 0o755)
-    shutil.copyfile(
-        os.path.join(dmg_tor_path, "MacOS", "Tor", "tor.real"),
-        os.path.join(dist_path, "MacOS", "Tor", "tor.real"),
-    )
-    shutil.copyfile(
-        os.path.join(dmg_tor_path, "MacOS", "Tor", "libevent-2.1.7.dylib"),
-        os.path.join(dist_path, "MacOS", "Tor", "libevent-2.1.7.dylib"),
-    )
-    os.chmod(os.path.join(dist_path, "MacOS", "Tor", "tor.real"), 0o755)
-    # obfs4proxy binary
-    shutil.copyfile(
-        os.path.join(dmg_tor_path, "MacOS", "Tor", "PluggableTransports", "obfs4proxy"),
-        os.path.join(dist_path, "Resources", "Tor", "obfs4proxy"),
-    )
-    os.chmod(os.path.join(dist_path, "Resources", "Tor", "obfs4proxy"), 0o755)
-
-    # Eject dmg
-    subprocess.call(["diskutil", "eject", "/Volumes/Tor Browser"])
-
-
-if __name__ == "__main__":
-    main()
diff --git a/desktop/install/get-tor-windows.py b/desktop/install/get-tor-windows.py
deleted file mode 100644
index 33de056b..00000000
--- a/desktop/install/get-tor-windows.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-OnionShare | https://onionshare.org/
-
-Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-"""
-This script downloads a pre-built tor binary to bundle with OnionShare.
-In order to avoid a Windows gnupg dependency, I manually verify the signature
-and hard-code the sha256 hash.
-"""
-
-import inspect
-import os
-import sys
-import hashlib
-import shutil
-import subprocess
-import requests
-
-
-def main():
-    exe_url = "https://archive.torproject.org/tor-package-archive/torbrowser/10.0/torbrowser-install-10.0_en-US.exe"
-    exe_filename = "torbrowser-install-10.0_en-US.exe"
-    expected_exe_sha256 = (
-        "3d1a337da0e6eae32071e6de21963ba628a1a0939477bf823aa7df9051215410"
-    )
-    # Build paths
-    root_path = os.path.dirname(
-        os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
-    )
-    working_path = os.path.join(root_path, "build", "tor")
-    exe_path = os.path.join(working_path, exe_filename)
-    dist_path = os.path.join(root_path, "src", "onionshare", "resources", "tor")
-
-    # Make sure the working folder exists
-    if not os.path.exists(working_path):
-        os.makedirs(working_path)
-
-    # Make sure Tor Browser is downloaded
-    if not os.path.exists(exe_path):
-        print("Downloading {}".format(exe_url))
-        r = requests.get(exe_url)
-        open(exe_path, "wb").write(r.content)
-        exe_sha256 = hashlib.sha256(r.content).hexdigest()
-    else:
-        exe_data = open(exe_path, "rb").read()
-        exe_sha256 = hashlib.sha256(exe_data).hexdigest()
-
-    # Compare the hash
-    if exe_sha256 != expected_exe_sha256:
-        print("ERROR! The sha256 doesn't match:")
-        print("expected: {}".format(expected_exe_sha256))
-        print("  actual: {}".format(exe_sha256))
-        sys.exit(-1)
-
-    # Extract the bits we need from the exe
-    subprocess.Popen([
-        "7z",
-        "e",
-        "-y",
-        exe_path,
-        "Browser\TorBrowser\Tor",
-        "-o%s" % os.path.join(working_path, "Tor"),
-    ]).wait()
-    subprocess.Popen([
-        "7z",
-        "e",
-        "-y",
-        exe_path,
-        "Browser\TorBrowser\Data\Tor\geoip*",
-        "-o%s" % os.path.join(working_path, "Data"),
-    ]).wait()
-
-    # Copy into the onionshare resources
-    if os.path.exists(dist_path):
-        shutil.rmtree(dist_path)
-    os.makedirs(dist_path)
-    shutil.copytree(os.path.join(working_path, "Tor"), os.path.join(dist_path, "Tor"))
-    shutil.copytree(
-        os.path.join(working_path, "Data"), os.path.join(dist_path, "Data", "Tor")
-    )
-
-
-if __name__ == "__main__":
-    main()
diff --git a/desktop/install/licenses/license-jquery.txt b/desktop/install/licenses/license-jquery.txt
deleted file mode 100644
index e3dbacb9..00000000
--- a/desktop/install/licenses/license-jquery.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright JS Foundation and other contributors, https://js.foundation/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/desktop/install/licenses/license-obfs4.txt b/desktop/install/licenses/license-obfs4.txt
deleted file mode 100644
index 6b89f8ca..00000000
--- a/desktop/install/licenses/license-obfs4.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-==============================================================================
-
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/desktop/install/licenses/license-onionshare.txt b/desktop/install/licenses/license-onionshare.txt
deleted file mode 100644
index 77d05583..00000000
--- a/desktop/install/licenses/license-onionshare.txt
+++ /dev/null
@@ -1,676 +0,0 @@
-Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com>
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/desktop/install/licenses/license-tor.txt b/desktop/install/licenses/license-tor.txt
deleted file mode 100644
index 3d0f8c12..00000000
--- a/desktop/install/licenses/license-tor.txt
+++ /dev/null
@@ -1,381 +0,0 @@
-                    This file contains the license for Tor,
-        a free software project to provide anonymity on the Internet.
-
-        It also lists the licenses for other components used by Tor.
-
-       For more information about Tor, see https://www.torproject.org/.
-
-             If you got this file as a part of a larger bundle,
-        there may be other license terms that you should be aware of.
-
-===============================================================================
-Tor is distributed under this license:
-
-Copyright (c) 2001-2004, Roger Dingledine
-Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
-Copyright (c) 2007-2017, The Tor Project, Inc.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-    * Neither the names of the copyright owners nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-===============================================================================
-src/ext/strlcat.c and src/ext/strlcpy.c by Todd C. Miller are licensed
-under the following license:
-
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-===============================================================================
-src/ext/tor_queue.h is licensed under the following license:
-
- * Copyright (c) 1991, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
-
-===============================================================================
-src/ext/csiphash.c is licensed under the following license:
-
- Copyright (c) 2013  Marek Majkowski <marek@popcount.org>
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-===============================================================================
-Trunnel is distributed under this license:
-
-Copyright 2014  The Tor Project, Inc.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-    * Neither the names of the copyright owners nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-===============================================================================
-src/config/geoip is licensed under the following license:
-
-OPEN DATA LICENSE (GeoLite Country and GeoLite City databases)
-
-Copyright (c) 2008 MaxMind, Inc.  All Rights Reserved.
-
-All advertising materials and documentation mentioning features or use of
-this database must display the following acknowledgment:
-"This product includes GeoLite data created by MaxMind, available from
-http://maxmind.com/"
-
-Redistribution and use with or without modification, are permitted provided
-that the following conditions are met:
-1. Redistributions must retain the above copyright notice, this list of
-conditions and the following disclaimer in the documentation and/or other
-materials provided with the distribution.
-2. All advertising materials and documentation mentioning features or use of
-this database must display the following acknowledgement:
-"This product includes GeoLite data created by MaxMind, available from
-http://maxmind.com/"
-3. "MaxMind" may not be used to endorse or promote products derived from this
-database without specific prior written permission.
-
-THIS DATABASE IS PROVIDED BY MAXMIND, INC ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL MAXMIND BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-===============================================================================
-m4/pc_from_ucontext.m4 is available under the following license.  Note that
-it is *not* built into the Tor software.
-
-Copyright (c) 2005, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-===============================================================================
-m4/pkg.m4 is available under the following license.  Note that
-it is *not* built into the Tor software.
-
-pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-serial 1 (pkg-config-0.24)
-
-Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-As a special exception to the GNU General Public License, if you
-distribute this file as part of a program that contains a
-configuration script generated by Autoconf, you may include it under
-the same distribution terms that you use for the rest of that program.
-===============================================================================
-src/ext/readpassphrase.[ch] are distributed under this license:
-
-  Copyright (c) 2000-2002, 2007 Todd C. Miller <Todd.Miller@courtesan.com>
-
-  Permission to use, copy, modify, and distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-  Sponsored in part by the Defense Advanced Research Projects
-  Agency (DARPA) and Air Force Research Laboratory, Air Force
-  Materiel Command, USAF, under agreement number F39502-99-1-0512.
-
-===============================================================================
-src/ext/mulodi4.c is distributed under this license:
-
-     =========================================================================
-     compiler_rt License
-     =========================================================================
-
-     The compiler_rt library is dual licensed under both the
-     University of Illinois "BSD-Like" license and the MIT license.
-     As a user of this code you may choose to use it under either
-     license.  As a contributor, you agree to allow your code to be
-     used under both.
-
-     Full text of the relevant licenses is included below.
-
-     =========================================================================
-
-     University of Illinois/NCSA
-     Open Source License
-
-     Copyright (c) 2009-2016 by the contributors listed in CREDITS.TXT
-
-     All rights reserved.
-
-     Developed by:
-
-         LLVM Team
-
-         University of Illinois at Urbana-Champaign
-
-         http://llvm.org
-
-     Permission is hereby granted, free of charge, to any person
-     obtaining a copy of this software and associated documentation
-     files (the "Software"), to deal with the Software without
-     restriction, including without limitation the rights to use,
-     copy, modify, merge, publish, distribute, sublicense, and/or sell
-     copies of the Software, and to permit persons to whom the
-     Software is furnished to do so, subject to the following
-     conditions:
-
-         * Redistributions of source code must retain the above
-           copyright notice, this list of conditions and the following
-           disclaimers.
-
-         * Redistributions in binary form must reproduce the above
-           copyright notice, this list of conditions and the following
-           disclaimers in the documentation and/or other materials
-           provided with the distribution.
-
-         * Neither the names of the LLVM Team, University of Illinois
-           at Urbana-Champaign, nor the names of its contributors may
-           be used to endorse or promote products derived from this
-           Software without specific prior written permission.
-
-     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-     NONINFRINGEMENT.  IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT
-     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-     OTHER DEALINGS WITH THE SOFTWARE.
-
-     =========================================================================
-
-     Copyright (c) 2009-2015 by the contributors listed in CREDITS.TXT
-
-     Permission is hereby granted, free of charge, to any person
-     obtaining a copy of this software and associated documentation
-     files (the "Software"), to deal in the Software without
-     restriction, including without limitation the rights to use,
-     copy, modify, merge, publish, distribute, sublicense, and/or sell
-     copies of the Software, and to permit persons to whom the
-     Software is furnished to do so, subject to the following
-     conditions:
-
-     The above copyright notice and this permission notice shall be
-     included in all copies or substantial portions of the Software.
-
-     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-     OTHER DEALINGS IN THE SOFTWARE.
-
-     =========================================================================
-     Copyrights and Licenses for Third Party Software Distributed with LLVM:
-     =========================================================================
-
-     The LLVM software contains code written by third parties.  Such
-     software will have its own individual LICENSE.TXT file in the
-     directory in which it appears.  This file will describe the
-     copyrights, license, and restrictions which apply to that code.
-
-     The disclaimer of warranty in the University of Illinois Open
-     Source License applies to all code in the LLVM Distribution, and
-     nothing in any of the other licenses gives permission to use the
-     names of the LLVM Team or the University of Illinois to endorse
-     or promote products derived from this Software.
-
-===============================================================================
-If you got Tor as a static binary with OpenSSL included, then you should know:
- "This product includes software developed by the OpenSSL Project
- for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-===============================================================================
diff --git a/desktop/install/licenses/readme.txt b/desktop/install/licenses/readme.txt
deleted file mode 100644
index 3dd5d2fe..00000000
--- a/desktop/install/licenses/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-This folder contains 3rd-party licenses for software included with OnionShare.
diff --git a/desktop/install/onionshare.nsi b/desktop/install/onionshare.nsi
deleted file mode 100644
index 21ac0baa..00000000
--- a/desktop/install/onionshare.nsi
+++ /dev/null
@@ -1,111 +0,0 @@
-!define APPNAME "OnionShare"
-!define BINPATH "..\dist\onionshare"
-!define ABOUTURL "https:\\onionshare.org\"
-
-# change these with each release
-!define INSTALLSIZE 132423
-!define VERSIONMAJOR 2
-!define VERSIONMINOR 3
-!define VERSIONSTRING "2.3.dev1"
-
-RequestExecutionLevel admin
-
-Name "OnionShare"
-InstallDir "$PROGRAMFILES\${APPNAME}"
-Icon "onionshare.ico"
-
-!include LogicLib.nsh
-
-Page directory
-Page instfiles
-
-!macro VerifyUserIsAdmin
-UserInfo::GetAccountType
-pop $0
-${If} $0 != "admin" ;Require admin rights on NT4+
-    messageBox mb_iconstop "Administrator rights required!"
-    setErrorLevel 740 ;ERROR_ELEVATION_REQUIRED
-    quit
-${EndIf}
-!macroend
-
-# in order to code sign uninstall.exe, we need to do some hacky stuff outlined
-# here: http:\\nsis.sourceforge.net\Signing_an_Uninstaller
-!ifdef INNER
-    !echo "Creating uninstall.exe"
-    OutFile "$%TEMP%\tempinstaller.exe"
-    SetCompress off
-!else
-    !echo "Creating normal installer"
-    !system "makensis.exe /DINNER onionshare.nsi" = 0
-    !system "$%TEMP%\tempinstaller.exe" = 2
-    !system "signtool.exe sign /v /d $\"Uninstall OnionShare$\" /a /tr http://time.certum.pl/ $%TEMP%\uninstall.exe" = 0
-
-    # all done, now we can build the real installer
-    OutFile "..\dist\onionshare-setup.exe"
-    SetCompressor /FINAL /SOLID lzma
-!endif
-
-Function .onInit
-    !ifdef INNER
-        WriteUninstaller "$%TEMP%\uninstall.exe"
-        Quit # bail out early
-    !endif
-
-    setShellVarContext all
-    !insertmacro VerifyUserIsAdmin
-FunctionEnd
-
-Section "install"
-    SetOutPath "$INSTDIR"
-    File "onionshare.ico"
-    File /a /r "${BINPATH}\"
-
-    # uninstaller
-    !ifndef INNER
-        SetOutPath $INSTDIR
-        File $%TEMP%\uninstall.exe
-    !endif
-
-    # start menu
-    CreateShortCut "$SMPROGRAMS\${APPNAME}.lnk" "$INSTDIR\onionshare-gui.exe" "" "$INSTDIR\onionshare.ico"
-
-    # registry information for add\remove programs
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}"
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" \S"
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "InstallLocation" "$\"$INSTDIR$\""
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$\"$INSTDIR\onionshare.ico$\""
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "URLInfoAbout" "$\"${ABOUTURL}$\""
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" ${VERSIONSTRING}
-    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "VersionMajor" ${VERSIONMAJOR}
-    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "VersionMinor" ${VERSIONMINOR}
-    # there is no option for modifying or repairing the install
-    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" 1
-    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" 1
-    # set the INSTALLSIZE constant (!defined at the top of this script) so Add\Remove Programs can accurately report the size
-    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "EstimatedSize" ${INSTALLSIZE}
-SectionEnd
-
-# uninstaller
-Function un.onInit
-    SetShellVarContext all
-
-    #Verify the uninstaller - last chance to back out
-    MessageBox MB_OKCANCEL "Uninstall ${APPNAME}?" IDOK next
-        Abort
-    next:
-    !insertmacro VerifyUserIsAdmin
-FunctionEnd
-
-!ifdef INNER
-    Section "uninstall"
-        Delete "$SMPROGRAMS\${APPNAME}.lnk"
-
-        # remove files
-        RMDir /r $INSTDIR
-
-        # remove uninstaller information from the registry
-        DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}"
-    SectionEnd
-!endif
diff --git a/desktop/install/onionshare80.xpm b/desktop/install/onionshare80.xpm
deleted file mode 100644
index a3d0f6dc..00000000
--- a/desktop/install/onionshare80.xpm
+++ /dev/null
@@ -1,257 +0,0 @@
-/* XPM */
-static char * icon_xpm[] = {
-"80 80 174 2",
-"  	c None",
-". 	c #4E0D4E",
-"+ 	c #531453",
-"@ 	c #581B58",
-"# 	c #673067",
-"$ 	c #906890",
-"% 	c #B397B3",
-"& 	c #CFBECF",
-"* 	c #E0D5E0",
-"= 	c #F0EBF0",
-"- 	c #FCFCFC",
-"; 	c #4F0E4F",
-"> 	c #6E396E",
-", 	c #8F668F",
-"' 	c #C1AAC1",
-") 	c #EFE9EF",
-"! 	c #FFFFFF",
-"~ 	c #865986",
-"{ 	c #C5B0C5",
-"] 	c #EAE2EA",
-"^ 	c #764476",
-"/ 	c #DFD4DF",
-"( 	c #FAF9FA",
-"_ 	c #5E235E",
-": 	c #BDA5BD",
-"< 	c #885C88",
-"[ 	c #E8DFE8",
-"} 	c #521352",
-"| 	c #B89EB8",
-"1 	c #FCFBFC",
-"2 	c #5B1F5B",
-"3 	c #4D0C4D",
-"4 	c #571A57",
-"5 	c #5D225D",
-"6 	c #D8C9D8",
-"7 	c #612761",
-"8 	c #D4C4D4",
-"9 	c #D4C5D4",
-"0 	c #4E0C4E",
-"a 	c #632A63",
-"b 	c #DDD1DD",
-"c 	c #693269",
-"d 	c #DED3DE",
-"e 	c #FDFCFD",
-"f 	c #F6F3F6",
-"g 	c #D7C9D7",
-"h 	c #A482A4",
-"i 	c #7E4E7E",
-"j 	c #652D65",
-"k 	c #521252",
-"l 	c #490649",
-"m 	c #4B094B",
-"n 	c #662E66",
-"o 	c #D9CCD9",
-"p 	c #DCD0DC",
-"q 	c #A584A5",
-"r 	c #622862",
-"s 	c #440044",
-"t 	c #470447",
-"u 	c #4A084A",
-"v 	c #4C0A4C",
-"w 	c #825482",
-"x 	c #6F3A6F",
-"y 	c #4D0B4D",
-"z 	c #642B64",
-"A 	c #DBCFDB",
-"B 	c #F7F3F7",
-"C 	c #9B779B",
-"D 	c #835683",
-"E 	c #E5DBE5",
-"F 	c #E4DAE4",
-"G 	c #E8E0E8",
-"H 	c #713C71",
-"I 	c #4C0B4C",
-"J 	c #8C628C",
-"K 	c #E2D9E2",
-"L 	c #672F67",
-"M 	c #6D386D",
-"N 	c #E7DFE7",
-"O 	c #622962",
-"P 	c #926A92",
-"Q 	c #FAF8FA",
-"R 	c #E2D7E2",
-"S 	c #6C376C",
-"T 	c #4A074A",
-"U 	c #6B346B",
-"V 	c #CCBACC",
-"W 	c #875C87",
-"X 	c #F9F7F9",
-"Y 	c #7B4C7B",
-"Z 	c #DED4DE",
-"` 	c #5B1E5B",
-" .	c #855885",
-"..	c #DDD2DD",
-"+.	c #895E89",
-"@.	c #DBCEDB",
-"#.	c #4B084B",
-"$.	c #7F507F",
-"%.	c #F7F4F7",
-"&.	c #5F245F",
-"*.	c #764576",
-"=.	c #551755",
-"-.	c #FEFEFE",
-";.	c #D7CAD7",
-">.	c #5C205C",
-",.	c #815381",
-"'.	c #F3EEF3",
-").	c #774577",
-"!.	c #F4F0F4",
-"~.	c #D3C3D3",
-"{.	c #591C59",
-"].	c #703C70",
-"^.	c #FEFDFE",
-"/.	c #D3C4D3",
-"(.	c #511051",
-"_.	c #501150",
-":.	c #B093B0",
-"<.	c #B59AB5",
-"[.	c #FDFDFD",
-"}.	c #B79CB7",
-"|.	c #B599B5",
-"1.	c #895F89",
-"2.	c #734073",
-"3.	c #987298",
-"4.	c #9A759A",
-"5.	c #8A608A",
-"6.	c #511251",
-"7.	c #602660",
-"8.	c #CEBCCE",
-"9.	c #F1ECF1",
-"0.	c #855985",
-"a.	c #5E225E",
-"b.	c #784778",
-"c.	c #DED1DE",
-"d.	c #F3EFF3",
-"e.	c #7F517F",
-"f.	c #F5F1F5",
-"g.	c #470347",
-"h.	c #5D215D",
-"i.	c #F3F0F3",
-"j.	c #865B86",
-"k.	c #450145",
-"l.	c #D6C7D6",
-"m.	c #F4F1F4",
-"n.	c #805280",
-"o.	c #E6DCE6",
-"p.	c #885D88",
-"q.	c #5C215C",
-"r.	c #E6DDE6",
-"s.	c #F8F6F8",
-"t.	c #936C93",
-"u.	c #460246",
-"v.	c #DACDDA",
-"w.	c #F6F4F6",
-"x.	c #8E658E",
-"y.	c #450045",
-"z.	c #5E245E",
-"A.	c #642C64",
-"B.	c #DED2DE",
-"C.	c #F7F5F7",
-"D.	c #EEE7EE",
-"E.	c #EDE6ED",
-"F.	c #916991",
-"G.	c #ECE5EC",
-"H.	c #FBF9FB",
-"I.	c #6A336A",
-"J.	c #662F66",
-"K.	c #FBFAFB",
-"L.	c #956F95",
-"M.	c #E9E1E9",
-"N.	c #DACCDA",
-"O.	c #541654",
-"P.	c #BAA1BA",
-"Q.	c #4E0E4E",
-"                                                                    . . . . . . . . . . . .                                                                     ",
-"                                                            . . . . . . . . . . . . . . . . . . . .                                                             ",
-"                                                    . . . . . . . . . . . . . . . . . . . . . . . . . . . .                                                     ",
-"                                                . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .                                                 ",
-"                                            . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .                                             ",
-"                                        . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .                                         ",
-"                                    . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .                                     ",
-"                                  . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .                                   ",
-"                              . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .                               ",
-"                            . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .                             ",
-"                          . . . . . . . . . . . . . . . . . . + @ # $ % & * = - - = * & % $ # @ + . . . . . . . . . . . . . . . . . .                           ",
-"                        . . . . . . . . . . . . . . . . ; > , ' ) ! ! ! ! ! ! ! ! ! ! ! ! ! ! ) ' , > ; . . . . . . . . . . . . . . . .                         ",
-"                      . . . . . . . . . . . . . . . . ~ { ] ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ] { ~ . . . . . . . . . . . . . . . .                       ",
-"                    . . . . . . . . . . . . . . . ^ / ( ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ( / ^ . . . . . . . . . . . . . . .                     ",
-"                  . . . . . . . . . . . . . . _ : ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! : _ . . . . . . . . . . . . . .                   ",
-"                . . . . . . . . . . . . . . < [ ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! [ < . . . . . . . . . . . . . .                 ",
-"                . . . . . . . . . . . . } | 1 ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! 1 | } . . . . . . . . . . . .                 ",
-"              . . . . . . . . . . . . 2 & ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! & 2 . . . . . . . . . . . .               ",
-"            . . . . . . . . . . . . 2 & ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! & 2 . . . . . . . . . . . .             ",
-"            . . . . . . . . . 3 3 4 & ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! & 2 . . . . . . . . . . .             ",
-"          . . . . . . . . . . . . 5 6 ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! & } . . . . . . . . . . .           ",
-"          . . . . . . . . . . . . . 7 8 ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! | . . . . . . . . . . .           ",
-"        . . . . . . . . . . . . . . . _ 9 ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! 1 < . . . . . . . . . . .         ",
-"        . . . . . . . 3 0 . . . . . . . a b ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! [ _ . . . . . . . . . .         ",
-"      . . . . . . . . 0 . . . . . . . . . c d ! ! ! ! ! ! ! ! ! ! e f g h i j k k j i h g f e ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! : . . . . . . . . . . .       ",
-"      . . . . . . . . . . . . . l m . . . . n o ! ! ! ! ! ! ! ! p q r s t u v . . v u t s r q p ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ^ . . . . . . . . . .       ",
-"    . . . . . . . . . . . . . 3 w x y . . . . z A ! ! ! ! ! B C 7 t v . . . . . . . . . . v t 7 C B ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! / . . . . . . . . . . .     ",
-"    . . . . . 3 0 . . . . . y D ! E 7 3 . . . . c F ! ! ! G H ; 3 . . . . . . . . . . . . . . 3 ; H G ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ( ~ . . . . . . . . . .     ",
-"    . . . . . 0 . . . . 3 I J ! ! ! K L l . . . . M E ! N O u . . . . . . . . . . . . . . . . . . u O N ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! { ; . . . . . . . . .     ",
-"    . . . . . . . . . . I P Q ! ! ! ! R S T . . . . U V O l . . . . . . . . . . . . . . . . . . . . l O G ! ! ! ! ! ! ! ! ! ! ! ! ! ! ] > . . . . . . . . .     ",
-"  . . . . 0 . . . . . v W X ! ! ! ! ! ! / j 3 . . . . + u . . . . . . . . . . . . . . . . . . . . . . u H B ! ! ! ! ! ! ! ! ! ! ! ! ! ! , . . . . . . . . . .   ",
-"  . . . 0 . . . . . v Y ! ! ! ! ! ! ! ! ! Z ` 0 . . . . . 3 . . . . . . . . . . . . . . . . . . . . . . ; C ! ! ! ! ! ! ! ! ! ! ! ! ! ! ' + . . . . . . . . .   ",
-"  . . 0 . . . . 0 I  .! ! ! ! ! ! ! ! ! ! ! ..7 u . . . . . 3 . . . . . . . . . . . . . . . . . . . . . 3 7 p ! ! ! ! ! ! ! ! ! ! ! ! ! ) @ . . . . . . . . .   ",
-"  . . . . . . . v +.B ! ! ! ! ! ! ! ! ! ! ! ! @.L #.. . . . . 3 . . . . . . . . . . . . . . . . . . . . . t q e ! ! ! ! ! ! ! ! ! ! ! ! ! # . . . . . . . . .   ",
-". 0 . . . . . m $.%.! ! ! ! ! ! ! ! ! ! ! ! ! ! o &.. . . . . . 3 . . . . . . . . . . . . . . . . . . . . v r f ! ! ! ! ! ! ! ! ! ! ! ! ! $ . . . . . . . . . . ",
-"3 . . . . . m *.! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! o =.. . . . . . 3 . . . . . . . . . . . . . . . . . . . . s g ! ! ! ! ! ! ! ! ! ! ! ! ! % . . . . . . . . . . ",
-". . . . . v i -.! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ;.>.m . . . . 3 3 . . . . . . . . . . . . . . . . . . . t h ! ! ! ! ! ! ! ! ! ! ! ! ! & . . . . . . . . . . ",
-". . . . v ,.'.! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! 9 r v . . . . . 3 . . . . . . . . . . . . . . . . . . u i ! ! ! ! ! ! ! ! ! ! ! ! ! * . . . . . . . . . . ",
-". . . u ).!.! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ~.{.. . . . . . 3 . . . . . . . . . . . . . . . . . v j ! ! ! ! ! ! ! ! ! ! ! ! ! = . . . . . . . . . . ",
-". . m ].^.! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! /.(.. . . . . . 3 . . . . . . . . . . . . . . . . . k ! ! ! ! ! ! ! ! ! ! ! ! ! - . . . . . . . . . . ",
-". y _.:.<.<.<.<.<.<.[.! ! ! ! ! ! ! ! ! ! ! ! ! }.<.<.<.|.<.1.l . . . . . 3 . . . . 3 . . . . . m 2.3.3.3.3.3.4.! ! ! ! ! ! ! ! ! ! ! ! ! [.3.3.3.3.3.3.5.6.3 . ",
-". . . . . . . . . . = ! ! ! ! ! ! ! ! ! ! ! ! ! j v . . . . . . . . . . . . . . . . 3 . . . . . y 7.8.! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! 9.0.#.. . ",
-". . . . . . . . . . * ! ! ! ! ! ! ! ! ! ! ! ! ! i u . . . . . . . . . . . . . . . . . 3 . . . . . 3 a.8.! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! 9.b.m . . . ",
-". . . . . . . . . . & ! ! ! ! ! ! ! ! ! ! ! ! ! h t . . . . . . . . . . . . . . . . . . 3 . . . . . 3 2 c.! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! d.e.3 . . . . ",
-". . . . . . . . . . % ! ! ! ! ! ! ! ! ! ! ! ! ! g s . . . . . . . . . . . . . . . . . . . 3 . . . . . m {./ ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! f.5.g.. . . . . ",
-". . . . . . . . . . $ ! ! ! ! ! ! ! ! ! ! ! ! ! f r v . . . . . . . . . . . . . . . . . . . 3 . . . . . m h.8 ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! i.j.k.. . . . . 0 ",
-"  . . . . . . . . . # ! ! ! ! ! ! ! ! ! ! ! ! ! e q t . . . . . . . . . . . . . . . . . . . . 3 . . . . . y r l.! ! ! ! ! ! ! ! ! ! ! ! ! ! m.n.m . . . . . 3   ",
-"  . . . . . . . . . @ ) ! ! ! ! ! ! ! ! ! ! ! ! ! p 7 3 . . . . . . . . . . . . . . . . . . . . 3 . . . . . y &.o.! ! ! ! ! ! ! ! ! ! ! ! %.p.y . . . . . 3 .   ",
-"  . . . . . . . . . + ' ! ! ! ! ! ! ! ! ! ! ! ! ! ! C ; . . . . . . . . . . . . . . . . . . . . . 3 . . . . . #.q.r.! ! ! ! ! ! ! ! ! ! s.t.u.. . . . . 3 . .   ",
-"  . . . . . . . . . . , ! ! ! ! ! ! ! ! ! ! ! ! ! ! B H u . . . . . . . . . . . . . . . . . . . . . 3 3 . . . . #.7 v.! ! ! ! ! ! ! ! w.x.y.. . . . . 3 . . .   ",
-"    . . . . . . . . . > ] ! ! ! ! ! ! ! ! ! ! ! ! ! ! G O l . . . . . . . . . . . . . . . . . . . . l z.A.. . . . y L B.! ! ! ! ! ! C.+.v . . . . . 3 . . .     ",
-"    . . . . . . . . . ; { ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! N O u . . . . . . . . . . . . . . . . . . u O N D.h.. . . . y O E.! ! ! ! ( F.y . . . . . 3 . . . .     ",
-"    . . . . . . . . . . ~ ( ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! G H ; 3 . . . . . . . . . . . . . . 3 ; H G ! ! D.a . . . . u 7.G.! ! H.C k.. . . . . 3 . . . . .     ",
-"    . . . . . . . . . . . / ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! B C 7 t v . . . . . . . . . . v t 7 C B ! ! ! ! R I.. . . . #.J.R K.L.y.. . . . . 3 . . . . . .     ",
-"      . . . . . . . . . . ^ ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! p q r s t u v . . v u t s r q p ! ! ! ! ! ! ! * 7 . . . . y x n.y . . . . . 3 . . . . . .       ",
-"      . . . . . . . . . . . : ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! e f g h i j k k j i h g f e ! ! ! ! ! ! ! ! ! M.@ . . . . . . . . . . . 3 . . . . . . .       ",
-"        . . . . . . . . . . _ [ ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! G _ . . . . . . . . . 3 . . . . . . .         ",
-"        . . . . . . . . . . . < 1 ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! @.A.. . . . . . . 3 . . . . . . . .         ",
-"          . . . . . . . . . . . | ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! N.2 . . . . . 3 3 . . . . . . .           ",
-"          . . . . . . . . . . . } & ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! F O.. . . 3 . . . . . . . . .           ",
-"            . . . . . . . . . . . 2 & ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! P.Q.. 3 . . . . . . . . .             ",
-"            . . . . . . . . . . . . 2 & ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! & 2 0 3 . . . . . . . . . .             ",
-"              . . . . . . . . . . . . 2 & ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! & 2 . . . . . . . . . . . .               ",
-"                . . . . . . . . . . . . } | 1 ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! 1 | } . . . . . . . . . . . .                 ",
-"                . . . . . . . . . . . . . . < [ ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! [ < . . . . . . . . . . . . . .                 ",
-"                  . . . . . . . . . . . . . . _ : ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! : _ . . . . . . . . . . . . . .                   ",
-"                    . . . . . . . . . . . . . . . ^ / ( ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ( / ^ . . . . . . . . . . . . . . .                     ",
-"                      . . . . . . . . . . . . . . . . ~ { ] ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ] { ~ . . . . . . . . . . . . . . . .                       ",
-"                        . . . . . . . . . . . . . . . . ; > , ' ) ! ! ! ! ! ! ! ! ! ! ! ! ! ! ) ' , > ; . . . . . . . . . . . . . . . .                         ",
-"                          . . . . . . . . . . . . . . . . . . + @ # $ % & * = - - = * & % $ # @ + . . . . . . . . . . . . . . . . . .                           ",
-"                            . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .                             ",
-"                              . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .                               ",
-"                                  . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .                                   ",
-"                                    . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .                                     ",
-"                                        . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .                                         ",
-"                                            . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .                                             ",
-"                                                . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .                                                 ",
-"                                                    . . . . . . . . . . . . . . . . . . . . . . . . . . . .                                                     ",
-"                                                            . . . . . . . . . . . . . . . . . . . .                                                             ",
-"                                                                    . . . . . . . . . . . .                                                                     "};
diff --git a/desktop/install/ppa_release.sh b/desktop/install/ppa_release.sh
deleted file mode 100755
index cb1a4cdb..00000000
--- a/desktop/install/ppa_release.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# This script pushes updates to my Ubuntu PPA: https://launchpad.net/~micahflee/+archive/ppa
-# If you want to use it, you'll need your own ~/.dput.cf and ssh key.
-# More info: https://help.launchpad.net/Packaging/PPA/Uploading
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
-cd $DIR
-
-VERSION=`cat share/version.txt`
-
-rm -rf deb_dist >/dev/null 2>&1
-python3 setup.py --command-packages=stdeb.command sdist_dsc
-cd deb_dist/onionshare-$VERSION
-dpkg-buildpackage -S
-cd ..
-dput ppa:micahflee/ppa onionshare_$VERSION-1_source.changes
-cd ..
diff --git a/desktop/install/pyinstaller.spec b/desktop/install/pyinstaller.spec
deleted file mode 100644
index 24c0ed07..00000000
--- a/desktop/install/pyinstaller.spec
+++ /dev/null
@@ -1,116 +0,0 @@
-# -*- mode: python -*-
-
-import os
-import platform
-from distutils.sysconfig import get_python_lib
-
-p = platform.system()
-
-version = open("share/version.txt").read().strip()
-
-paths = ["."]
-if p == "Windows":
-    paths.append(os.path.join(get_python_lib(), "PyQt5", "Qt", "bin"))
-    paths.append(
-        os.path.join(
-            os.path.abspath(os.sep),
-            "Program Files (x86)",
-            "Windows Kits",
-            "10",
-            "bin",
-            "x86",
-        )
-    )
-    paths.append(
-        os.path.join(
-            os.path.abspath(os.sep),
-            "Program Files (x86)",
-            "Windows Kits",
-            "10",
-            "bin",
-            "x64",
-        )
-    )
-    paths.append(
-        os.path.join(
-            os.path.abspath(os.sep),
-            "Program Files (x86)",
-            "Windows Kits",
-            "10",
-            "Redist",
-            "ucrt",
-            "DLLs",
-            "x86",
-        )
-    )
-    paths.append(
-        os.path.join(
-            os.path.abspath(os.sep),
-            "Program Files (x86)",
-            "Windows Kits",
-            "10",
-            "Redist",
-            "ucrt",
-            "DLLs",
-            "x64",
-        )
-    )
-
-a = Analysis(
-    ["scripts/onionshare-pyinstaller"],
-    pathex=paths,
-    binaries=None,
-    datas=[
-        ("../share/version.txt", "share"),
-        ("../share/wordlist.txt", "share"),
-        ("../share/torrc_template", "share"),
-        ("../share/torrc_template-obfs4", "share"),
-        ("../share/torrc_template-meek_lite_azure", "share"),
-        ("../share/images/*", "share/images"),
-        ("../share/locale/*", "share/locale"),
-        ("../share/static/*", "share/static"),
-        ("../share/templates/*", "share/templates"),
-        ("../share/static/css/*", "share/static/css"),
-        ("../share/static/img/*", "share/static/img"),
-        ("../share/static/js/*", "share/static/js"),
-        ("../install/licenses/*", "licenses"),
-    ],
-    hiddenimports=["engineio.async_drivers.threading"],
-    hookspath=[],
-    runtime_hooks=[],
-    win_no_prefer_redirects=False,
-    win_private_assemblies=False,
-    cipher=None,
-)
-
-pyz = PYZ(a.pure, a.zipped_data, cipher=None)
-
-# Show console in dev releases, don't show console in production releases
-console = "dev" in version
-
-exe = EXE(
-    pyz,
-    a.scripts,
-    exclude_binaries=True,
-    name="onionshare-gui",
-    debug=False,
-    strip=False,
-    upx=True,
-    console=console,
-)
-
-coll = COLLECT(
-    exe, a.binaries, a.zipfiles, a.datas, strip=False, upx=True, name="onionshare"
-)
-
-if p == "Darwin":
-    app = BUNDLE(
-        coll,
-        name="OnionShare.app",
-        icon="onionshare.icns",
-        bundle_identifier="com.micahflee.onionshare",
-        info_plist={
-            "CFBundleShortVersionString": version,
-            "NSHighResolutionCapable": "True",
-        },
-    )
diff --git a/desktop/install/scripts/onionshare-nautilus.py b/desktop/install/scripts/onionshare-nautilus.py
deleted file mode 100644
index 776ca5de..00000000
--- a/desktop/install/scripts/onionshare-nautilus.py
+++ /dev/null
@@ -1,105 +0,0 @@
-import os
-import sys
-import json
-import locale
-import subprocess
-try:
-    import urllib.request
-except:
-    import urllib
-import gi
-
-gi.require_version("Nautilus", "3.0")
-
-from gi.repository import Nautilus
-from gi.repository import GObject
-
-# Put me in /usr/share/nautilus-python/extensions/
-class OnionShareExtension(GObject.GObject, Nautilus.MenuProvider):
-    def __init__(self):
-        # Get the localized string for "Share via OnionShare" label
-        self.label = None
-        default_label = "Share via OnionShare"
-
-        try:
-            # Re-implement localization in python2
-            default_locale = "en"
-            locale_dir = os.path.join(sys.prefix, "share/onionshare/locale")
-            if os.path.exists(locale_dir):
-                # Load all translations
-                strings = {}
-                translations = {}
-                for filename in os.listdir(locale_dir):
-                    abs_filename = os.path.join(locale_dir, filename)
-                    lang, ext = os.path.splitext(filename)
-                    if ext == ".json":
-                        with open(abs_filename) as f:
-                            translations[lang] = json.load(f)
-
-                strings = translations[default_locale]
-                lc, enc = locale.getdefaultlocale()
-                if lc:
-                    lang = lc[:2]
-                    if lang in translations:
-                        # if a string doesn't exist, fallback to English
-                        for key in translations[default_locale]:
-                            if key in translations[lang]:
-                                strings[key] = translations[lang][key]
-
-                self.label = strings["share_via_onionshare"]
-
-        except:
-            self.label = default_label
-
-        if not self.label:
-            self.label = default_label
-
-        """
-        # This more elegant solution will only work if nautilus is using python3, and onionshare is installed system-wide.
-        # But nautilus is using python2, so this is commented out.
-        try:
-            import onionshare
-            onionshare.strings.load_strings(onionshare.common)
-            self.label = onionshare.strings._('share_via_onionshare')
-        except:
-            import sys
-            print('python version: {}').format(sys.version)
-            self.label = 'Share via OnionShare'
-        """
-
-    def url2path(self, url):
-        file_uri = url.get_activation_uri()
-        arg_uri = file_uri[7:]
-        try:
-            path = urllib.request.url2pathname(arg_uri)
-        except:
-            path = urllib.url2pathname(arg_uri)
-        return path
-
-    def exec_onionshare(self, filenames):
-        # Would prefer this method but there is a conflict between GTK 2.0 vs GTK 3.0 components being loaded at once
-        # (nautilus:3090): Gtk-ERROR **: GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in the same process is not supported
-        #        sys.argv = ["", "--filenames"] + filenames
-        #        sys.exit(onionshare_gui.main())
-        path = os.path.join(os.sep, "usr", "bin", "onionshare-gui")
-        cmd = [path, "--filenames"] + filenames
-        subprocess.Popen(cmd)
-
-    def get_file_items(self, window, files):
-        menuitem = Nautilus.MenuItem(
-            name="OnionShare::Nautilus", label=self.label, tip="", icon=""
-        )
-        menu = Nautilus.Menu()
-        menu.append_item(menuitem)
-        menuitem.connect("activate", self.menu_activate_cb, files)
-        return (menuitem,)
-
-    def menu_activate_cb(self, menu, files):
-        file_list = []
-        for file in files:
-            file_list.append(self.url2path(file))
-        self.exec_onionshare(file_list)
-
-    # Workaround https://bugzilla.gnome.org/show_bug.cgi?id=784278
-    def get_background_items(self, window, file):
-        return None