Make it work in Windows

7 files changed, 276 insertions, 468 deletions

diff --git a/.gitignore b/.gitignore
index d75584e3..97ba1380 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,4 +55,9 @@ venv
 
 # other
 .vscode
-onionshare.dist-info
\ No newline at end of file
+onionshare.dist-info
+
+# Tor binaries
+cli/onionshare_cli/resources/tor
+desktop/linux
+desktop/windows
\ No newline at end of file
diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py
index 19a6f11a..0c034a87 100644
--- a/cli/onionshare_cli/common.py
+++ b/cli/onionshare_cli/common.py
@@ -87,19 +87,11 @@ class Common:
             tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip")
             tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6")
         elif self.platform == "Windows":
-            base_path = os.path.join(
-                os.path.dirname(os.path.dirname(self.get_resource_path(""))), "tor"
-            )
-            tor_path = os.path.join(os.path.join(base_path, "Tor"), "tor.exe")
-            obfs4proxy_file_path = os.path.join(
-                os.path.join(base_path, "Tor"), "obfs4proxy.exe"
-            )
-            tor_geo_ip_file_path = os.path.join(
-                os.path.join(os.path.join(base_path, "Data"), "Tor"), "geoip"
-            )
-            tor_geo_ipv6_file_path = os.path.join(
-                os.path.join(os.path.join(base_path, "Data"), "Tor"), "geoip6"
-            )
+            base_path = self.get_resource_path("tor")
+            tor_path = os.path.join(base_path, "Tor", "tor.exe")
+            obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")
+            tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")
+            tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")
         elif self.platform == "Darwin":
             base_path = os.path.dirname(
                 os.path.dirname(os.path.dirname(self.get_resource_path("")))
diff --git a/cli/scripts/get-tor-osx.py b/cli/scripts/get-tor-osx.py
new file mode 100644
index 00000000..a05870f2
--- /dev/null
+++ b/cli/scripts/get-tor-osx.py
@@ -0,0 +1,126 @@
+# -*- 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/cli/scripts/get-tor-windows.py b/cli/scripts/get-tor-windows.py
new file mode 100644
index 00000000..a5c4ebb1
--- /dev/null
+++ b/cli/scripts/get-tor-windows.py
@@ -0,0 +1,100 @@
+# -*- 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, "onionshare_cli", "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/BUILD.md b/desktop/BUILD.md
deleted file mode 100644
index b261f540..00000000
--- a/desktop/BUILD.md
+++ /dev/null
@@ -1,437 +0,0 @@
-# Index
-* [Building OnionShare](#building-onionshare)
-  * [Linux](#linux)
-    * [Use newest software](#use-newest-software)
-    * [Use package managers](#use-package-managers)
-  * [macOS](#macos)
-  * [Windows](#windows)
-    * [Setting up your dev environment](#setting-up-your-dev-environment)
-    * [To make a .exe](#to-make-a-exe)
-    * [To build the installer](#to-build-the-installer)
-* [Running tests](#running-tests)
-* [Documentation]
-* [Making releases](#making-releases)
-  * [Changelog, version, and signed git tag](#changelog-version-and-signed-git-tag)
-  * [Linux release](#linux-release)
-  * [macOS release](#macos-release)
-  * [Windows release](#windows-release)
-  * [Source package](#source-package)
-  * [Publishing the release](#publishing-the-release)
-
-# Building OnionShare
-
-Start by getting the source code:
-
-```sh
-git clone https://github.com/micahflee/onionshare.git
-cd onionshare
-```
-
-## Linux
-
-OnionShare uses [Briefcase](https://briefcase.readthedocs.io/en/latest/).
-
-Install Briefcase dependencies from your package repositories by following [these instructions](https://docs.beeware.org/en/latest/tutorial/tutorial-0.html#install-dependencies).
-
-Now create and/or activate a virtual environment.
-
-```
-python3 -m venv venv
-. venv/bin/activate
-```
-
-While your virtual environment is active, install briefcase from pip.
-
-```
-pip install briefcase
-```
-
-
-
-### Use newest software
-
-The recommended way to develop OnionShare is to use the latest versions of all dependencies.
-
-First, install `tor` and `obfs4proxy` from either the [official Debian repository](https://support.torproject.org/apt/tor-deb-repo/), or from your package manager.
-
-Then download Qt 5.14.0 for Linux:
-
-```sh
-cd ~/Downloads
-wget https://download.qt.io/official_releases/qt/5.14/5.14.0/qt-opensource-linux-x64-5.14.0.run
-```
-
-If you'd like to check to make sure you have the exact installer I have, here is the sha256 checksum:
-
-```sh
-sha256sum qt-opensource-linux-x64-5.14.0.run
-4379f147c6793ec7e7349d2f9ee7d53b8ab6ea4e4edf8ee0574a75586a6a6e0e  qt-opensource-linux-x64-5.14.0.run
-```
-
-Then make it executable and install Qt:
-
-```sh
-chmod +x qt-opensource-linux-x64-5.14.0.run
-./qt-opensource-linux-x64-5.14.0.run
-```
-
-You have to create a Qt account and login to install Qt. Choose the default installation folder in your home directory. The only component you need is `Qt 5.14.0` > `Desktop gcc 64-bit`.
-
-Install [poetry](https://python-poetry.org/docs/) from your package manager, or by doing `pip install --user poetry`. Then install dependencies:
-
-```sh
-poetry install
-```
-
-You can run the CLI and the GUI versions of OnionShare like this:
-
-```sh
-poetry run ./dev_scripts/onionshare
-poetry run ./dev_scripts/onionshare-gui
-```
-
-### Use package managers
-
-Alternatively, you can install dependencies from package managers.
-
-Install the needed dependencies:
-
-**For Debian-like distros:**
-
-```
-apt install -y python3-flask python3-stem python3-pyqt5 python3-crypto python3-socks python3-nautilus tor obfs4proxy python3-pytest python3-pytestqt build-essential fakeroot python3-all python3-stdeb dh-python python3-flask-httpauth python3-distutils python3-psutil python3-socketio python3-flask-socketio python3-qrcode
-```
-
-**For Fedora-like distros:**
-
-```
-dnf install -y python3-flask python3-flask-httpauth python3-stem python3-qt5 python3-crypto python3-pysocks nautilus-python tor obfs4 python3-pytest rpm-build python3-psutil python3-socketio python3-flask-socketio python3-qrcode
-```
-
-After that you can try both the CLI and the GUI version of OnionShare:
-
-```sh
-./dev_scripts/onionshare
-./dev_scripts/onionshare-gui
-```
-
-You can also build OnionShare packages to install:
-
-Create a .deb on Debian-like distros: `./install/build_deb.sh`
-
-Create a .rpm on Fedora-like distros: `./install/build_rpm.sh`
-
-For openSUSE: There are instructions for building [in the wiki](https://github.com/micahflee/onionshare/wiki/Linux-Distribution-Support#opensuse-leap-150).
-
-For ArchLinux: There is a PKBUILD available [here](https://www.archlinux.org/packages/community/any/onionshare/) that can be used to install OnionShare.
-
-If you find that these instructions don't work for your Linux distribution or version, consult the [Linux Distribution Support wiki guide](https://github.com/micahflee/onionshare/wiki/Linux-Distribution-Support), which might contain extra instructions.
-
-## macOS
-
-Install Xcode from the Mac App Store. Once it's installed, run it for the first time to set it up. Also, run this to make sure command line tools are installed: `xcode-select --install`. And finally, open Xcode, go to Preferences > Locations, and make sure under Command Line Tools you select an installed version from the dropdown. (This is required for installing Qt5.)
-
-Download and install Python 3.7.4 from https://www.python.org/downloads/release/python-374/. I downloaded `python-3.7.4-macosx10.9.pkg`.
-
-You may also need to run the command `/Applications/Python\ 3.7/Install\ Certificates.command` to update Python 3.6's internal certificate store. Otherwise, you may find that fetching the Tor Browser .dmg file fails later due to a certificate validation error.
-
-Install Qt 5.14.0 for macOS from https://www.qt.io/offline-installers. I downloaded `qt-opensource-mac-x64-5.14.0.dmg`. In the installer, you can skip making an account, and all you need is `Qt` > `Qt 5.14.0` > `macOS`.
-
-If you don't have it already, install poetry (`pip3 install --user poetry`). Then install dependencies:
-
-```sh
-poetry install
-```
-
-#### You can run both the CLI and GUI versions of OnionShare without building an bundle
-
-```sh
-poetry run ./dev_scripts/onionshare
-poetry run ./dev_scripts/onionshare-gui
-```
-
-#### To build the app bundle
-
-```sh
-install/build_osx.sh
-```
-
-Now you should have `dist/OnionShare.app`.
-
-#### To codesign and build a DMG for distribution
-
-If you want to build for distribution, you'll need a codesigning certificate, and you'll also need to have [create-dmg](https://github.com/sindresorhus/create-dmg) installed:
-
-```sh
-npm install --global create-dmg
-brew install graphicsmagick imagemagick
-```
-
-And then run:
-
-```sh
-install/build_osx.sh --release
-```
-
-Now you should have `dist/OnionShare $VERSION.dmg`.
-
-## Windows
-
-### Setting up your dev environment
-
-These instructions include adding folders to the path in Windows. To do this, go to Start and type "advanced system settings", and open "View advanced system settings" in the Control Panel. Click Environment Variables. Under "System variables" double-click on Path. From there you can add and remove folders that are available in the PATH.
-
-Download Python 3.7.4, 32-bit (x86) from https://www.python.org/downloads/release/python-374/. I downloaded `python-3.7.4.exe`. When installing it, make sure to check the "Add Python 3.7 to PATH" checkbox on the first page of the installer.
-
-Install the Qt 5.14.0 from https://www.qt.io/offline-installers. I downloaded `qt-opensource-windows-x86-5.14.0.exe`. In the installer, you can skip making an account, and all you need `Qt` > `Qt 5.14.0` > `MSVC 2017 32-bit`.
-
-Install [poetry](https://python-poetry.org/). Open PowerShell, and run:
-
-```
-(Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py -UseBasicParsing).Content | python
-```
-
-Then open a Command Prompt and cd to the `onionshare` folder, and install the poetry dependencies:
-
-```
-poetry install
-```
-
-After that you can try both the CLI and the GUI version of OnionShare:
-
-```
-poetry run python dev_scripts\onionshare
-poetry run python dev_scripts\onionshare-gui
-```
-
-#### If you want to build a .exe
-
-Download and install 7-Zip from http://www.7-zip.org/download.html. I downloaded `7z1900.exe`.
-
-Download and install the standalone [Windows 10 SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk). Note that you may not need this if you already have Visual Studio.
-
-Add the following directories (you might want to make sure these are exact on your computer) to the path:
-
-* `C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x86`
-* `C:\Program Files (x86)\Windows Kits\10\Redist\10.0.18362.0\ucrt\DLLs\x86`
-* `C:\Program Files (x86)\7-Zip`
-
-And also for PyQt5, but replace `onionshare-i_zmdpLh-py3.7` with the name of your poetry virtual environment. You can find that by running `poetry env list`.
-
-* `C:\Users\user\AppData\Local\pypoetry\Cache\virtualenvs\onionshare-i_zmdpLh-py3.7\Lib\site-packages\PyQt5\Qt\bin`
-
-#### If you want the .exe to not get falsely flagged as malicious by anti-virus software
-
-OnionShare uses PyInstaller to turn the python source code into Windows executable `.exe` file. Apparently, malware developers also use PyInstaller, and some anti-virus vendors have included snippets of PyInstaller code in their virus definitions. To avoid this, you have to compile the Windows PyInstaller bootloader yourself instead of using the pre-compiled one that comes with PyInstaller.
-
-(If you don't care about this, you can install PyInstaller with `pip install PyInstaller==4.0`.)
-
-Here's how to compile the PyInstaller bootloader:
-
-Download and install [Microsoft Build Tools for Visual Studio 2019](https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2019). I downloaded `vs_buildtools__1285639570.1568593053.exe`. In the installer, check the box next to "Visual C++ build tools". Click "Individual components", and under "Compilers, build tools and runtimes", check "Windows Universal CRT SDK". Then click install. When installation is done, you may have to reboot your computer.
-
-Then, enable the 32-bit Visual C++ Toolset on the Command Line like this:
-
-```
-cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build"
-vcvars32.bat
-```
-
-Change to a folder where you keep source code, and clone the PyInstaller git repo and checkout the `v4.0` tag:
-
-```
-git clone https://github.com/pyinstaller/pyinstaller.git
-cd pyinstaller
-git checkout v4.0
-```
-
-The next step is to compile the bootloader. We should do this all in dangerzone's poetry shell:
-
-```
-cd onionshare
-poetry shell
-cd ..\pyinstaller
-```
-
-And compile the bootloader, following [these instructions](https://pythonhosted.org/PyInstaller/bootloader-building.html). To compile, run this:
-
-```
-cd bootloader
-python waf distclean all --target-arch=32bit --msvc_targets=x86
-```
-
-Finally, install the PyInstaller module into your poetry environment:
-
-```
-cd ..
-python setup.py install
-exit
-```
-
-Now the next time you use PyInstaller to build OnionShare, the `.exe` file should not be flagged as malicious by anti-virus.
-
-#### If you want to build the installer
-
-* Go to http://nsis.sourceforge.net/Download and download the latest NSIS. I downloaded `nsis-3.06.1-setup.exe`.
-* Add `C:\Program Files (x86)\NSIS` to the path.
-
-#### If you want to sign binaries with Authenticode
-
-* You'll need a code signing certificate. I got an open source code signing certificate from [Certum](https://www.certum.eu/certum/cert,offer_en_open_source_cs.xml).
-* Once you get a code signing key and certificate and covert it to a pfx file, import it into your certificate store.
-
-### To make a .exe:
-
-* Open a command prompt, cd into the onionshare directory, and type: `pyinstaller install\pyinstaller.spec`. `onionshare-gui.exe` and all of their supporting files will get created inside the `dist` folder.
-
-### To build the installer:
-
-Note that you must have a codesigning certificate installed in order to use the `install\build_exe.bat` script, because it codesigns `onionshare-gui.exe`, `uninstall.exe`, and `onionshare-setup.exe`.
-
-Open a command prompt, cd to the onionshare directory, and type: `install\build_exe.bat`
-
-This will prompt you to codesign three binaries and execute one unsigned binary. When you're done clicking through everything you will have `dist\onionshare-setup.exe`.
-
-# Running tests
-
-## Tests in macOS and Linux
-
-OnionShare includes PyTest unit tests. To run tests, you can run `pytest` against the `tests/` directory.
-
-```sh
-poetry run ./tests/run.sh
-```
-
-You can run GUI tests like this:
-
-```sh
-poetry run ./tests/run.sh --rungui
-```
-
-If you're using Linux, you can also choose to wrap the tests in `xvfb-run` so that a ton of OnionShare windows don't pop up on your desktop (you may need to install the `xorg-x11-server-Xvfb` package), like this:
-
-```sh
-xvfb-run poetry run ./tests/run.sh --rungui
-```
-
-## Tests in Windows
-
-You can run this Windows batch script to run all of the CLI and GUI tests.
-
-```
-poetry run tests\run.bat
-```
-
-# Documentation
-
-To edit and build the documentation, see the [docs readme](/docs/README.md).
-
-# Making releases
-
-This section documents the release process. Unless you're a core OnionShare developer making a release, you'll probably never need to follow it.
-
-## Changelog, version, docs, and signed git tag
-
-Before making a release, you must update the version in these places:
-
-* `share/version.txt` should have the correct version
-* `pyproject.toml` should have the correct version
-* `docs/source/conf.py` should have the correct version
-* `install/org.onionshare.OnionShare.appdata.xml` should have the correct version
-* `install/onionshare.nsi` should have the correct version, for the Windows installer
-
-In addition to that, you must:
-
-* `install/org.onionshare.OnionShare.appdata.xml` should have the correct release date, and links to correct screenshots
-* `CHANGELOG.md` should be updated to include a list of all major changes since the last release
-* Update all of the documentation to cover new features, including taking new screenshots if necessary
-* There must be a PGP-signed git tag for the version, e.g. for OnionShare 2.1, the tag must be `v2.1`
-
-The first step for the Linux, macOS, and Windows releases is the same:
-
-Verify the release git tag:
-
-```
-git fetch
-git tag -v v$VERSION
-```
-
-If the tag verifies successfully, check it out:
-
-```
-git checkout v$VERSION
-```
-
-## Linux release
-
-TODO: Write Flatpak instructions (see [this issue](https://github.com/micahflee/onionshare/issues/910)).
-
-To make a PPA release:
-
-- Go to Ubuntu build machine, which must have `~/.dput.cf` with the correct PPA info in it, and with the correct PGP signing key
-- Verify and checkout the git tag for this release
-- Run `./install/ppa_release.sh`, which builds a source package and uploads to the PPA build server
-- Login to Launchpad to monitor the build and make sure it is successful; if not, make minor patches and try the release again
-- After build is successful, from Launchpad, copy the binary from `cosmic` into other suites
-
-## macOS release
-
-- Build machine should be running macOS 10.13.6, and must have the Apple-trusted `Developer ID Application: Micah Lee` and `Developer ID Installer: Micah Lee` code-signing certificates installed
-- Verify and checkout the git tag for this release
-- Run `poetry install && poetry run ./install/build_osx.sh --release`; this will make a codesigned installer package called `dist/OnionShare $VERSION.dmg`
-- Notarize it: `xcrun altool --notarize-app --primary-bundle-id "com.micahflee.onionshare" -u "micah@micahflee.com" -p "$APPLEIDPW" --file "OnionShare $VERSION.dmg"`
-- Wait for it to get approved, check status with: `xcrun altool --notarization-history 0 -u "micah@micahflee.com" -p "$APPLEIDPW"`
-- After it's approved, staple the ticket: `xcrun stapler staple "OnionShare $VERSION.dmg"`
-- PGP-sign the final, notarized and stapled, `gpg -a --detach-sign "OnionShare $VERSION.dmg"`
-
-This process ends up with two final files:
-
-```
-OnionShare $VERSION.dmg
-OnionShare $VERSION.dmg.asc
-```
-
-## Windows release
-
-To make a Windows release, go to Windows build machine:
-
-- Build machine should be running Windows 10, and have the Windows codesigning certificate installed
-- Verify and checkout the git tag for this release
-- Run `install\build_exe.bat`; this will make a codesigned installer package called `dist\onionshare-$VERSION-setup.exe`
-- Copy `onionshare-$VERSION-setup.exe` to developer machine
-
-Then move back to the developer machine:
-
-- PGP-sign the Windows installer, `gpg -a --detach-sign onionshare-$VERSION-setup.exe`
-
-This process ends up with two final files:
-
-```
-onionshare-$VERSION-setup.exe
-onionshare-$VERSION-setup.exe.asc
-```
-
-## Source package
-
-To make a source package, run `./install/build_source.sh $TAG`, where `$TAG` is the the name of the signed git tag, e.g. `v2.1`.
-
-This process ends up with two final files in `dist`:
-
-```
-onionshare-$VERSION.tar.gz
-onionshare-$VERSION.tar.gz.asc
-```
-
-## Publishing the release
-
-To publish the release:
-
-- Create a new release on GitHub, put the changelog in the description of the release, and upload all six files (the macOS installer, the Windows installer, the source package, and their signatures)
-- Upload the six release files to https://onionshare.org/dist/$VERSION/
-- Copy the six release files into the OnionShare team Keybase filesystem
-- Update the [onionshare-website](https://github.com/micahflee/onionshare-website) repo:
-  - Edit `latest-version.txt` to match the latest version
-  - Update the version number and download links
-  - Deploy to https://onionshare.org/
-- Email the [onionshare-dev](https://lists.riseup.net/www/subscribe/onionshare-dev) mailing list announcing the release
-- Make a PR to [homebrew-cask](https://github.com/homebrew/homebrew-cask) to update the macOS version
diff --git a/desktop/README.md b/desktop/README.md
index 96306cf4..71f3082f 100644
--- a/desktop/README.md
+++ b/desktop/README.md
@@ -2,6 +2,13 @@
 
 ## Building OnionShare
 
+Start by getting the source code and changing to the `desktop` folder:
+
+```sh
+git clone https://github.com/micahflee/onionshare.git
+cd onionshare/desktop
+```
+
 ### Install platform-specific dependencies
 
 #### Linux
@@ -12,15 +19,27 @@ If you're using Linux, install `tor` and `obfs4proxy` from either the [official
 
 #### Windows
 
-### Prepare the code
+These instructions include adding folders to the path in Windows. To do this, go to Start and type "advanced system settings", and open "View advanced system settings" in the Control Panel. Click Environment Variables. Under "System variables" double-click on Path. From there you can add and remove folders that are available in the PATH.
 
-Get the source code and change to the `desktop` folder:
+Download Python 3.8.6, 32-bit (x86) from https://www.python.org/downloads/release/python-386/. I downloaded `python-3.8.6.exe`. When installing it, make sure to check the "Add Python 3.8 to PATH" checkbox on the first page of the installer.
+
+Download and install 7-Zip from http://www.7-zip.org/download.html. I downloaded `7z1900.exe`. Add `C:\Program Files (x86)\7-Zip` to your path.
+
+Install dependencies:
 
-```sh
-git clone https://github.com/micahflee/onionshare.git
-cd onionshare/desktop
+```
+pip install requests
+```
+
+Download Tor Browser and extract the binaries by running:
+
+```
+cd ..\cli
+python scripts\get-tor-windows.py
 ```
 
+### Prepare the code
+
 OnionShare uses [Briefcase](https://briefcase.readthedocs.io/en/latest/).
 
 Install Briefcase dependencies by following [these instructions](https://docs.beeware.org/en/latest/tutorial/tutorial-0.html#install-dependencies).
@@ -32,6 +51,13 @@ python3 -m venv venv
 . venv/bin/activate
 ```
 
+Or in Windows:
+
+```
+python -m venv venv
+venv\Scripts\activate.bat
+```
+
 While your virtual environment is active, install briefcase from pip.
 
 ```
diff --git a/desktop/install/get-tor-windows.py b/desktop/install/get-tor-windows.py
index 8b3e3c72..33de056b 100644
--- a/desktop/install/get-tor-windows.py
+++ b/desktop/install/get-tor-windows.py
@@ -43,17 +43,15 @@ def main():
     root_path = os.path.dirname(
         os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
     )
-    working_path = os.path.join(os.path.join(root_path, "build"), "tor")
+    working_path = os.path.join(root_path, "build", "tor")
     exe_path = os.path.join(working_path, exe_filename)
-    dist_path = os.path.join(
-        os.path.join(os.path.join(root_path, "dist"), "onionshare"), "tor"
-    )
+    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 the zip is downloaded
+    # Make sure Tor Browser is downloaded
     if not os.path.exists(exe_path):
         print("Downloading {}".format(exe_url))
         r = requests.get(exe_url)
@@ -71,26 +69,24 @@ def main():
         sys.exit(-1)
 
     # Extract the bits we need from the exe
-    cmd = [
+    subprocess.Popen([
         "7z",
         "e",
         "-y",
         exe_path,
         "Browser\TorBrowser\Tor",
         "-o%s" % os.path.join(working_path, "Tor"),
-    ]
-    cmd2 = [
+    ]).wait()
+    subprocess.Popen([
         "7z",
         "e",
         "-y",
         exe_path,
         "Browser\TorBrowser\Data\Tor\geoip*",
         "-o%s" % os.path.join(working_path, "Data"),
-    ]
-    subprocess.Popen(cmd).wait()
-    subprocess.Popen(cmd2).wait()
+    ]).wait()
 
-    # Copy into dist
+    # Copy into the onionshare resources
     if os.path.exists(dist_path):
         shutil.rmtree(dist_path)
     os.makedirs(dist_path)