.gitignore

@@ -48,3 +48,6 @@ tags
 
 # OSX
 .DS_Store
+
+# virtualenv
+venv

BUILD.md

@@ -14,7 +14,7 @@ Install the needed dependencies:
 For Debian-like distros:
 
 ```
-apt install -y python3-flask python3-stem python3-pyqt5 python3-crypto python3-socks python3-distutils python-nautilus tor obfs4proxy python3-pytest build-essential fakeroot python3-all python3-stdeb dh-python
+apt install -y python3-flask python3-stem python3-pyqt5 python3-crypto python3-socks python-nautilus tor obfs4proxy python3-pytest build-essential fakeroot python3-all python3-stdeb dh-python
 ```
 
 For Fedora-like distros:
@@ -42,7 +42,7 @@ For ArchLinux: There is a PKBUILD available [here](https://aur.archlinux.org/pac
 
 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.
 
-## Mac OS X
+## 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.)
 
@@ -50,9 +50,16 @@ Download and install Python 3.7.2 from https://www.python.org/downloads/release/
 
 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.11.3 from https://www.qt.io/download-open-source/. I downloaded `qt-unified-mac-x64-3.0.6-online.dmg`. In the installer, you can skip making an account, and all you need is `Qt` > `Qt 5.11.3` > `macOS`.
+Install Qt 5.12.1 from https://download.qt.io/archive/qt/5.12/5.12.1/. I downloaded `qt-opensource-mac-x64-5.12.1.dmg`. In the installer, you can skip making an account, and all you need is `Qt` > `Qt 5.12.1` > `macOS`.
 
-Now install some python dependencies with pip (note, there's issues building a .app if you install this in a virtualenv):
+Now install pip dependencies. If you want to use a virtualenv, create it and activate it first:
+
+```sh
+python3 -m venv venv
+. venv/bin/activate
+```
+
+Then install the dependencies:
 
 ```sh
 pip3 install -r install/requirements.txt
@@ -100,7 +107,7 @@ cd bootloader
 python3 waf distclean all --target-arch=64bit
 ```
 
-Finally, install the PyInstaller module into your local site-packages:
+Finally, install the PyInstaller module into your local site-packages. If you're using a virtualenv, make sure to run this last command while your virtualenv is activated:
 
 ```sh
 cd ..
@@ -135,7 +142,7 @@ Open a command prompt, cd to the onionshare folder, and install dependencies wit
 pip install -r install\requirements.txt
 ```
 
-Install the Qt 5.11.3 from https://www.qt.io/download-open-source/. I downloaded `qt-unified-windows-x86-3.0.6-online.exe`. In the installer, you can skip making an account, and all you need `Qt` > `Qt 5.11.3` > `MSVC 2015 32-bit`.
+Install the Qt 5.12.1 from https://download.qt.io/archive/qt/5.12/5.12.1/. I downloaded `qt-opensource-windows-x86-5.12.1.exe`. In the installer, you can skip making an account, and all you need `Qt` > `Qt 5.12.1` > `MSVC 2017 32-bit`.
 
 After that you can try both the CLI and the GUI version of OnionShare:
 
@@ -150,14 +157,14 @@ These instructions include adding folders to the path in Windows. To do this, go
 
 Download and install the 32-bit [Visual C++ Redistributable for Visual Studio 2015](https://www.microsoft.com/en-US/download/details.aspx?id=48145). I downloaded `vc_redist.x86.exe`.
 
-Download and install 7-Zip from http://www.7-zip.org/download.html. I downloaded `7z1805.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://dev.windows.com/en-us/downloads/windows-10-sdk). Note that you may not need this if you already have Visual Studio.
 
 Add the following directories to the path:
 
-* `C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86`
-* `C:\Program Files (x86)\Windows Kits\10\Redist\10.0.17763.0\ucrt\DLLs\x86`
+* `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:\Users\user\AppData\Local\Programs\Python\Python37-32\Lib\site-packages\PyQt5\Qt\bin`
 * `C:\Program Files (x86)\7-Zip`
 
@@ -169,7 +176,7 @@ OnionShare uses PyInstaller to turn the python source code into Windows executab
 
 Here's how to compile the PyInstaller bootloader:
 
-Download and install [Microsoft Build Tools for Visual Studio 2017](https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017). I downloaded `vs_buildtools.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.
+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__265029578.1555959436.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:
 
@@ -181,7 +188,7 @@ vcvars32.bat
 Make sure you have a new enough `setuptools`:
 
 ```
-pip install setuptools==40.6.3
+pip install --upgrade setuptools
 ```
 
 Now make sure you don't have PyInstaller installed from pip:
@@ -254,7 +261,7 @@ Open a command prompt, cd to the onionshare directory, and type: `install\build_
 
 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`.
 
-## Tests
+# Running tests
 
 OnionShare includes PyTest unit tests. To run the tests, first install some dependencies:
 
@@ -287,3 +294,114 @@ You can also choose to wrap the tests in `xvfb-run` so that a ton of OnionShare
 ```sh
 xvfb-run pytest --rungui tests/
 ```
+
+# 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, and signed git tag
+
+Before making a release, all of these should be complete:
+
+* `share/version.txt` should have the correct version
+* `install/onionshare.nsi` should have the correct version, for the Windows installer
+* `CHANGELOG.md` should be updated to include a list of all major changes since the last release
+* 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
+
+To make a macOS release, go to macOS build machine:
+
+- Build machine should be running macOS 10.11.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 `./install/build_osx.sh --release`; this will make a codesigned installer package called `dist/OnionShare-$VERSION.pkg`
+- Copy `OnionShare-$VERSION.pkg` to developer machine
+
+Then move back to the developer machine:
+
+- PGP-sign the macOS installer, `gpg --detach-sign OnionShare-$VERSION.pkg`
+
+Note that once we support notarizing the macOS installer (see [this issue](https://github.com/micahflee/onionshare/issues/953)), these will be the steps instead:
+
+- Developer machine, running the latest macOS, must have an app-specific Apple ID password saved in the login keychain called `onionshare-notarize`
+- Notarize it: `xcrun altool --notarize-app --primary-bundle-id "com.micahflee.onionshare" -u "micah@micahflee.com" -p "@keychain:onionshare-notarize" --file OnionShare-$VERSION.pkg`
+- Wait for it to get approved, check status with: `xcrun altool --notarization-history 0 -u "micah@micahflee.com" -p "@keychain:onionshare-notarize"`
+- After it's approved, staple the ticket: `xcrun stapler staple OnionShare-$VERSION.pkg`
+- PGP-sign the final, notarized and stapled, `gpg -a --detach-sign OnionShare-$VERSION.pkg`
+
+This process ends up with two final files:
+
+```
+OnionShare-$VERSION.pkg
+OnionShare-$VERSION.pkg.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/
+- 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

CHANGELOG.md

 # OnionShare Changelog
 
+## 2.1
+
+* New feature: Auto-start timer, which allows scheduling when the server starts
+* Renamed CLI argument --debug to --verbose
+* Make Tor connection timeout configurable as a CLI argument
+* Updated various dependencies, including to fix third-party security issues in urllib3, jinja2, and jQuery
+* Update Tor to 0.3.5.8
+* New translations:
+  * Traditional Chinese (正體中文 (繁體)),
+  * Simplified Chinese (中文 (简体))
+  * Finnish (Suomi)
+  * German (Deutsch)
+  * Icelandic (Íslenska)
+  * Irish (Gaeilge)
+  * Norwegian Bokmål (Norsk Bokmål)
+  * Polish (Polski)
+  * Portuguese Portugal (Português (Portugal))
+  * Telugu (తెలుగు)
+  * Turkish (Türkçe)
+  * Ukrainian (Українська)
+* Removed translations because less than 90% of the strings were translated:
+  * Bengali (বাংলা)
+  * Persian (فارسی),
+
 ## 2.0
 
 * New feature: Receiver mode allows you to receive files with OnionShare, instead of only sending files

README.md

@@ -8,11 +8,17 @@ Unlike services like email, Google Drive, DropBox, WeTransfer, or nearly any oth
 
 To learn how OnionShare works, what its security properties are, and how to use it, check out the [wiki](https://github.com/micahflee/onionshare/wiki).
 
-## Downloading OnionShare
+## Installing OnionShare
 
 You can download OnionShare for Windows and macOS from the [OnionShare website](https://onionshare.org).
 
-For Ubuntu-like Linux distributions, you could use this PPA to get the latest version:
+For macOS you can also use [Homebrew](https://brew.sh/):
+
+```
+brew cask install onionshare
+```
+
+For Ubuntu-like Linux distributions, you can use this PPA:
 
 ```
 sudo add-apt-repository ppa:micahflee/ppa

debian/changelog

+onionshare (2.1-1) unstable; urgency=medium
+
+  * New upstream release, uploading without binaries to ensure migration to
+    testing. (Closes: #928904)
+  * Add myself to Uploaders field.
+  * Correct spelling, format and syntax errors in manpage.
+  * Update debian/copyright; socks.py no longer in upstream.
+  * Drop trailing quasi-newline in package long description.
+  * Misc updates:
+    * Drop "ancient" X-Python3-Version specifier (satisfied in oldoldstable).
+    - Move to debhelper compatibility level 12.
+    - Use the debhelper-compat virtual package, dropping debian/compat.
+    - Bump Standards-Version to 4.4.0.
+  * debian/watch:
+    - Ignore "dev" releases.
+    - Move to version 4 format.
+
+ -- Chris Lamb <lamby@debian.org>  Sat, 10 Aug 2019 15:02:42 +0100
+
 onionshare (2.0-3) unstable; urgency=medium
 
+  [ Ulrike Uhlig ]
   * Add missing build dependency python3-requests. (Closes: #925903)
 
- -- Ulrike Uhlig <ulrike@debian.org>  Fri, 05 Apr 2019 17:48:53 +0200
+ -- Chris Lamb <lamby@debian.org>  Sat, 10 Aug 2019 15:01:20 +0100
 
 onionshare (2.0-2) unstable; urgency=medium
 

debian/compat

-9

debian/control

 Source: onionshare
 Maintainer: Debian Privacy Tools Maintainers <pkg-privacy-maintainers@lists.alioth.debian.org>
-Uploaders: Ulrike Uhlig <ulrike@debian.org>, anonym <anonym@riseup.net>
+Uploaders: Ulrike Uhlig <ulrike@debian.org>, anonym <anonym@riseup.net>, Chris Lamb <lamby@debian.org>
 Section: net
 Priority: optional
-Build-Depends: debhelper (>= 9.20120909~), dh-python, python3-all, python3-crypto, python3-distutils-extra, python3-flask, python-nautilus, python3-nose, python3-pyqt5, python3-pytest, python3-requests, python3-setuptools, python3-socks, python3-stem (>= 1.4.0)
-X-Python3-Version: >= 3.2
-Standards-Version: 4.3.0
+Build-Depends: debhelper-compat (= 12), dh-python, python3-all, python3-crypto, python3-distutils-extra, python3-flask, python-nautilus, python3-nose, python3-pyqt5, python3-pytest, python3-requests, python3-setuptools, python3-socks, python3-stem (>= 1.4.0)
+Standards-Version: 4.4.0
 Homepage: https://onionshare.org
 Vcs-Git: https://salsa.debian.org/pkg-privacy-team/onionshare.git
 Vcs-Browser: https://salsa.debian.org/pkg-privacy-team/onionshare
@@ -22,4 +21,3 @@ Description: Share a file over Tor Hidden Services anonymously and securely
  computer and use a Tor hidden service to make it temporarily accessible
  over the Internet. The other user just needs to use the Tor Browser and
  to enter the URL to download the file from you.
- .

debian/copyright

@@ -7,34 +7,6 @@ Files: *
 Copyright: 2014 Micah Lee <micah@micahflee.com>
 License: GPL-3.0
 
-Files: onionshare/socks.py
-Copyright: 2006 Dan Haim <negativeiq@users.sourceforge.net>
-License: BSD-3-clause
- 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.
-
 Files: debian/*
 Copyright: 2014 Debian Anonymity Tools Packaging Team <pkg-anonymity-tools@lists.alioth.debian.org>
 License: GPL-3.0

debian/onionshare.1

@@ -10,7 +10,7 @@ onionshare \- a tool for anonymously sharing files over a temporarily set up Tor
 
 .SH DESCRIPTION
 .PP
-\fBOnionShare\fP lets you anonymously share files. This works either in send or in receive mode. OnionShare sets up use a Tor hidden service to either make files on your computer temporarily accessible over the Internet, or allow to upload files to your computer using a hidden service. OnionShare generates an unguessable URL to down- or upload files that you can share with your peers.
+\fBOnionShare\fP lets you anonymously share files. This works either in send or in receive mode. OnionShare sets up use a Tor hidden service to either make files on your computer temporarily accessible over the Internet, or allows the uploading of files to your computer using a hidden service. OnionShare generates an unguessable URL to down- or upload files that you can share with your peers.
 .PP
 In case of sharing with many peers, please enable "Public mode", otherwise OnionShare might interpret multiple accesses as an attack and shut down the hidden service.
 .PP
@@ -37,10 +37,10 @@ don't exit after file has been successfully downloaded
 .IP --stealth
 Create stealth onion service (advanced)
 .B
-.IP --shutdown-timeout [int]
+.IP --shutdown-timeout\ N
 Shut down the onion service after N seconds
 .B
-.IP --config [configfile]
+.IP --config\ CONFIGFILE
 Path to a custom JSON config file (optional)
 .B
 .IP --debug

debian/watch

-version=3
-
-opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/onionshare-$1\.tar\.gz/ \
-  https://github.com/micahflee/onionshare/tags .*/v?(\d\S*)\.tar\.gz
+version=4
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%onionshare-$1.tar.gz%" \
+ https://github.com/micahflee/onionshare/tags \
+ (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate

install/build_osx.sh

@@ -27,11 +27,26 @@ if [ "$1" = "--release" ]; then
   ENTITLEMENTS_PARENT_PATH="$ROOT/install/macos_sandbox/parent.plist"
 
   echo "Codesigning the app bundle"
-  codesign --deep -s "$IDENTITY_NAME_APPLICATION" -f --entitlements "$ENTITLEMENTS_CHILD_PATH" "$APP_PATH"
-  codesign -s "$IDENTITY_NAME_APPLICATION" -f --entitlements "$ENTITLEMENTS_PARENT_PATH" "$APP_PATH"
+  codesign \
+    --deep \
+    -s "$IDENTITY_NAME_APPLICATION" \
+    --force \
+    --entitlements "$ENTITLEMENTS_CHILD_PATH" \
+    --timestamp \
+    "$APP_PATH"
+  codesign \
+    -s "$IDENTITY_NAME_APPLICATION" \
+    --force \
+    --entitlements "$ENTITLEMENTS_PARENT_PATH" \
+    --timestamp \
+    "$APP_PATH"
 
   echo "Creating an installer"
-  productbuild --sign "$IDENTITY_NAME_INSTALLER" --component "$APP_PATH" /Applications "$PKG_PATH"
+  productbuild \
+    --sign "$IDENTITY_NAME_INSTALLER" \
+    --component "$APP_PATH" /Applications \
+    --timestamp \
+    "$PKG_PATH"
 
   echo "Cleaning up"
   rm -rf "$APP_PATH"

install/build_rpm.sh

@@ -9,7 +9,7 @@ VERSION=`cat share/version.txt`
 rm -r build dist >/dev/null 2>&1
 
 # build binary package
-python3 setup.py bdist_rpm --requires="python3-flask, python3-stem, python3-qt5, python3-cryptography, python3-crypto, python3-pysocks, nautilus-python, tor, obfs4"
+python3 setup.py bdist_rpm --requires="python3-flask, python3-stem, python3-qt5, python3-crypto, python3-pysocks, nautilus-python, tor, obfs4"
 
 # install it
 echo ""

install/build_source.sh

+#!/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"

install/check_lacked_trans.py

@@ -56,8 +56,9 @@ def main():
 
     src = files_in(dir, 'onionshare') + \
           files_in(dir, 'onionshare_gui') + \
-          files_in(dir, 'onionshare_gui/share_mode') + \
-          files_in(dir, 'onionshare_gui/receive_mode') + \
+          files_in(dir, 'onionshare_gui/mode') + \
+          files_in(dir, 'onionshare_gui/mode/share_mode') + \
+          files_in(dir, 'onionshare_gui/mode/receive_mode') + \
           files_in(dir, 'install/scripts') + \
           files_in(dir, 'tests')
     pysrc = [p for p in src if p.endswith('.py')]

install/get-tor-osx.py

@@ -35,9 +35,9 @@ import subprocess
 import requests
 
 def main():
-    dmg_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/8.0.5/TorBrowser-8.0.5-osx64_en-US.dmg'
-    dmg_filename = 'TorBrowser-8.0.5-osx64_en-US.dmg'
-    expected_dmg_sha256 = '08f0f79181319b74f8ad3a3f8c72a46356ec47f1ca3e22eb42d92e51451d9411'
+    dmg_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/8.0.8/TorBrowser-8.0.8-osx64_en-US.dmg'
+    dmg_filename = 'TorBrowser-8.0.8-osx64_en-US.dmg'
+    expected_dmg_sha256 = '1dc01b95146352593c3f18ece25f8735120565f921e22c2827df819effdddca3'
 
     # Build paths
     root_path = os.path.dirname(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))

install/get-tor-windows.py

@@ -33,9 +33,9 @@ import subprocess
 import requests
 
 def main():
-    exe_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/8.0.5/torbrowser-install-8.0.5_en-US.exe'
-    exe_filename = 'torbrowser-install-8.0.5_en-US.exe'
-    expected_exe_sha256 = '860fdd06e4ea8dd4c46f221676251f5cc528676d4e256559ee3831a5f97492f1'
+    exe_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/8.0.8/torbrowser-install-8.0.8_en-US.exe'
+    exe_filename = 'torbrowser-install-8.0.8_en-US.exe'
+    expected_exe_sha256 = 'bfe32a737e9fa37bf0c8837dbf3385be41cd9e8f9a88850d8f2946bb736e784f'
     # Build paths
     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')

install/onionshare.desktop

@@ -7,7 +7,7 @@ Comment[de]=Teile Dateien sicher und anonym über das Tor-Netzwerk
 Exec=/usr/bin/onionshare-gui
 Terminal=false
 Type=Application
-Icon=/usr/share/pixmaps/onionshare80.xpm
+Icon=onionshare80
 Categories=Network;FileTransfer;
 Keywords=tor;anonymity;privacy;onion service;file sharing;file hosting;
 Keywords[da]=tor;anonymitet;privatliv;onion-tjeneste;fildeling;filhosting;

install/onionshare.nsi

@@ -5,8 +5,8 @@
 # change these with each release
 !define INSTALLSIZE 115186
 !define VERSIONMAJOR 2
-!define VERSIONMINOR 0
-!define VERSIONSTRING "2.0"
+!define VERSIONMINOR 1
+!define VERSIONSTRING "2.1"
 
 RequestExecutionLevel admin
 

install/requirements-tests.txt

-atomicwrites==1.2.1
-attrs==18.2.0
-more-itertools==4.3.0
-pluggy==0.8.0
-py==1.7.0
-pytest==4.0.1
+atomicwrites==1.3.0
+attrs==19.1.0
+more-itertools==5.0.0
+pluggy==0.9.0
+py==1.8.0
+pytest==4.4.1
 pytest-faulthandler==1.5.0
-pytest-qt==3.2.1
-six==1.11.0
-urllib3==1.24.1
+pytest-qt==3.2.2
+six==1.12.0
+urllib3==1.24.2

install/requirements.txt

 altgraph==0.16.1
-asn1crypto==0.24.0
-certifi==2018.10.15
-cffi==1.11.5
+certifi==2019.3.9
 chardet==3.0.4
 Click==7.0
-cryptography==2.4.2
 Flask==1.0.2
 future==0.17.1
-idna==2.7
+idna==2.8
 itsdangerous==1.1.0
-Jinja2==2.10
+Jinja2==2.10.1
 macholib==1.11
-MarkupSafe==1.1.0
-pefile==2018.8.8
-pycparser==2.19
-pycryptodome==3.7.2
-PyQt5==5.11.3
-PyQt5-sip==4.19.13
+MarkupSafe==1.1.1
+pefile==2019.4.18
+pycryptodome==3.8.1
+PyQt5==5.12.1
+PyQt5-sip==4.19.15
 PySocks==1.6.8
-requests==2.20.1
-six==1.11.0
-stem==1.7.0
-urllib3==1.24.1
-Werkzeug==0.14.1
+requests==2.21.0
+stem==1.7.1
+urllib3==1.24.2
+Werkzeug==0.15.2