Merge branch '435_support_bridges' of https://github.com/mig5/onionshare into mig5-435_support_bridges

5 files changed, 497 insertions, 491 deletions

diff --git a/install/build_rpm.sh b/install/build_rpm.sh
index 98cd9c5b..c103262c 100755
--- a/install/build_rpm.sh
+++ b/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, nautilus-python, tor"
+python3 setup.py bdist_rpm --requires="python3-flask, python3-stem, python3-qt5, nautilus-python, tor, obfs4"
 
 # install it
 echo ""
diff --git a/install/get-tor-osx.py b/install/get-tor-osx.py
index 76d8cb4f..f3ab48dc 100644
--- a/install/get-tor-osx.py
+++ b/install/get-tor-osx.py
@@ -84,6 +84,9 @@ def main():
     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.0.5.dylib'), os.path.join(dist_path, 'MacOS', 'Tor', 'libevent-2.0.5.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)
 
     # Unmount dmg
     subprocess.call(['diskutil', 'unmount', '/Volumes/Tor Browser'])
diff --git a/install/get-tor-windows.py b/install/get-tor-windows.py
index 83b8f2b3..4945ce68 100644
--- a/install/get-tor-windows.py
+++ b/install/get-tor-windows.py
@@ -24,18 +24,17 @@ In order to avoid a Windows gnupg dependency, I manually verify the signature
 and hard-code the sha256 hash.
 """
 
-import inspect, os, sys, hashlib, zipfile, io, shutil
+import inspect, os, sys, hashlib, shutil, subprocess
 import urllib.request
 
 def main():
-    zip_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/7.0.11/tor-win32-0.3.1.9.zip'
-    zip_filename = 'tor-win32-0.3.1.9.zip'
-    expected_zip_sha256 = 'faf28efb606455842bda66ca369287a116b6d6e5ad3720ebed9337da0717f1b4'
-
+    exe_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/7.0.11/torbrowser-install-7.0.11_en-US.exe'
+    exe_filename = 'torbrowser-install-7.0.11_en-US.exe'
+    expected_exe_sha256 = 'a033eb9b9ed2ad389169b36a90946a8af8f05bd0c7bbd3e37678041331096624'
     # 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')
-    zip_path = os.path.join(working_path, zip_filename)
+    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')
 
     # Make sure the working folder exists
@@ -43,36 +42,35 @@ def main():
         os.makedirs(working_path)
 
     # Make sure the zip is downloaded
-    if not os.path.exists(zip_path):
-        print("Downloading {}".format(zip_url))
-        response = urllib.request.urlopen(zip_url)
-        zip_data = response.read()
-        open(zip_path, 'wb').write(zip_data)
-        zip_sha256 = hashlib.sha256(zip_data).hexdigest()
+    if not os.path.exists(exe_path):
+        print("Downloading {}".format(exe_url))
+        response = urllib.request.urlopen(exe_url)
+        exe_data = response.read()
+        open(exe_path, 'wb').write(exe_data)
+        exe_sha256 = hashlib.sha256(exe_data).hexdigest()
     else:
-        zip_data = open(zip_path, 'rb').read()
-        zip_sha256 = hashlib.sha256(zip_data).hexdigest()
+        exe_data = open(exe_path, 'rb').read()
+        exe_sha256 = hashlib.sha256(exe_data).hexdigest()
 
     # Compare the hash
-    if zip_sha256 != expected_zip_sha256:
+    if exe_sha256 != expected_exe_sha256:
         print("ERROR! The sha256 doesn't match:")
-        print("expected: {}".format(expected_zip_sha256))
-        print("  actual: {}".format(zip_sha256))
+        print("expected: {}".format(expected_exe_sha256))
+        print("  actual: {}".format(exe_sha256))
         sys.exit(-1)
 
-    # Extract the zip
-    z = zipfile.ZipFile(io.BytesIO(zip_data))
-    z.extractall(working_path)
-
-    # Delete un-used files
-    os.remove(os.path.join(os.path.join(working_path, 'Tor'), 'tor-gencert.exe'))
+    # Extract the bits we need from the exe
+    cmd = ['7z', 'e', exe_path, 'Browser\TorBrowser\Tor', '-o%s' % os.path.join(working_path, 'Tor')]
+    cmd2 = ['7z', 'e', exe_path, 'Browser\TorBrowser\Data\Tor\geoip*', '-o%s' % os.path.join(working_path, 'Data')]
+    subprocess.Popen(cmd).wait()
+    subprocess.Popen(cmd2).wait()
 
     # Copy into dist
     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') )
+    shutil.copytree( os.path.join(working_path, 'Data'), os.path.join(dist_path, 'Data', 'Tor') )
 
 if __name__ == '__main__':
     main()
diff --git a/install/onionshare.nsi b/install/onionshare.nsi
index 03830909..c0a39f35 100644
--- a/install/onionshare.nsi
+++ b/install/onionshare.nsi
@@ -1,466 +1,470 @@
-!define APPNAME "OnionShare"

-!define BINPATH "..\dist\onionshare"

-!define ABOUTURL "https:\\onionshare.org\"

-

-# change these with each release

-!define INSTALLSIZE 54112

-!define VERSIONMAJOR 1

-!define VERSIONMINOR 1

-!define VERSIONSTRING "1.1"

-

-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/ /fd sha256 $%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 "${BINPATH}\api-ms-win-core-console-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-datetime-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-debug-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-errorhandling-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-file-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-file-l1-2-0.dll"

-	File "${BINPATH}\api-ms-win-core-file-l2-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-handle-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-heap-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-interlocked-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-libraryloader-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-localization-l1-2-0.dll"

-	File "${BINPATH}\api-ms-win-core-memory-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-namedpipe-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-processenvironment-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-processthreads-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-processthreads-l1-1-1.dll"

-	File "${BINPATH}\api-ms-win-core-profile-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-rtlsupport-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-string-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-synch-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-synch-l1-2-0.dll"

-	File "${BINPATH}\api-ms-win-core-sysinfo-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-timezone-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-core-util-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-crt-conio-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-crt-convert-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-crt-environment-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-crt-filesystem-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-crt-heap-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-crt-locale-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-crt-math-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-crt-multibyte-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-crt-process-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-crt-runtime-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-crt-stdio-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-crt-string-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-crt-time-l1-1-0.dll"

-	File "${BINPATH}\api-ms-win-crt-utility-l1-1-0.dll"

-	File "${BINPATH}\base_library.zip"

-	File "${BINPATH}\mfc140u.dll"

-	File "${BINPATH}\MSVCP140.dll"

-	File "${BINPATH}\onionshare-gui.exe"

-	File "${BINPATH}\onionshare-gui.exe.manifest"

-	File "${BINPATH}\pyexpat.pyd"

-	File "${BINPATH}\PyQt5.Qt.pyd"

-	File "${BINPATH}\PyQt5.QtCore.pyd"

-	File "${BINPATH}\PyQt5.QtGui.pyd"

-	File "${BINPATH}\PyQt5.QtPrintSupport.pyd"

-	File "${BINPATH}\PyQt5.QtWidgets.pyd"

-	File "${BINPATH}\python3.dll"

-	File "${BINPATH}\python36.dll"

-	File "${BINPATH}\pythoncom36.dll"

-	File "${BINPATH}\pywintypes36.dll"

-	File "${BINPATH}\Qt5Core.dll"

-	File "${BINPATH}\Qt5Gui.dll"

-	File "${BINPATH}\Qt5PrintSupport.dll"

-	File "${BINPATH}\Qt5Svg.dll"

-	File "${BINPATH}\Qt5Widgets.dll"

-	File "${BINPATH}\select.pyd"

-	File "${BINPATH}\sip.pyd"

-	File "${BINPATH}\ucrtbase.dll"

-	File "${BINPATH}\unicodedata.pyd"

-	File "${BINPATH}\VCRUNTIME140.dll"

-	File "${BINPATH}\win32api.pyd"

-	File "${BINPATH}\win32com.shell.shell.pyd"

-	File "${BINPATH}\win32trace.pyd"

-	File "${BINPATH}\win32ui.pyd"

-	File "${BINPATH}\win32wnet.pyd"

-	File "${BINPATH}\_asyncio.pyd"

-	File "${BINPATH}\_bz2.pyd"

-	File "${BINPATH}\_ctypes.pyd"

-	File "${BINPATH}\_decimal.pyd"

-	File "${BINPATH}\_hashlib.pyd"

-	File "${BINPATH}\_lzma.pyd"

-	File "${BINPATH}\_multiprocessing.pyd"

-	File "${BINPATH}\_overlapped.pyd"

-	File "${BINPATH}\_socket.pyd"

-	File "${BINPATH}\_ssl.pyd"

-	File "${BINPATH}\_win32sysloader.pyd"

-

-    SetOutPath "$INSTDIR\Include"

-	File "${BINPATH}\Include\pyconfig.h"

-

-	SetOutPath "$INSTDIR\lib2to3"

-	File "${BINPATH}\lib2to3\Grammar.txt"

-	File "${BINPATH}\lib2to3\Grammar3.6.2.candidate.2.pickle"

-	File "${BINPATH}\lib2to3\Grammar3.6.2.final.0.pickle"

-	File "${BINPATH}\lib2to3\Grammar3.6.3.candidate.1.pickle"

-	File "${BINPATH}\lib2to3\Grammar3.6.3.final.0.pickle"

-	File "${BINPATH}\lib2to3\Grammar3.6.4.candidate.1.pickle"

-	File "${BINPATH}\lib2to3\Grammar3.6.4.final.0.pickle"

-	File "${BINPATH}\lib2to3\PatternGrammar.txt"

-	File "${BINPATH}\lib2to3\PatternGrammar3.6.2.candidate.2.pickle"

-	File "${BINPATH}\lib2to3\PatternGrammar3.6.2.final.0.pickle"

-	File "${BINPATH}\lib2to3\PatternGrammar3.6.3.candidate.1.pickle"

-	File "${BINPATH}\lib2to3\PatternGrammar3.6.3.final.0.pickle"

-	File "${BINPATH}\lib2to3\PatternGrammar3.6.4.candidate.1.pickle"

-	File "${BINPATH}\lib2to3\PatternGrammar3.6.4.final.0.pickle"

-

-	SetOutPath "$INSTDIR\lib2to3\tests\data"

-	File "${BINPATH}\lib2to3\tests\data\README"

-

-	SetOutPath "$INSTDIR\PyQt5\Qt\bin"

-	File "${BINPATH}\PyQt5\Qt\bin\qt.conf"

-

-	SetOutPath "$INSTDIR\PyQt5\Qt\plugins\iconengines"

-	File "${BINPATH}\PyQt5\Qt\plugins\iconengines\qsvgicon.dll"

-

-	SetOutPath "$INSTDIR\PyQt5\Qt\plugins\imageformats"

-	File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qgif.dll"

-	File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qicns.dll"

-	File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qico.dll"

-	File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qjpeg.dll"

-	File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qsvg.dll"

-	File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qtga.dll"

-	File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qtiff.dll"

-	File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qwbmp.dll"

-	File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qwebp.dll"

-

-	SetOutPath "$INSTDIR\PyQt5\Qt\plugins\platforms"

-	File "${BINPATH}\PyQt5\Qt\plugins\platforms\qminimal.dll"

-	File "${BINPATH}\PyQt5\Qt\plugins\platforms\qoffscreen.dll"

-	File "${BINPATH}\PyQt5\Qt\plugins\platforms\qwindows.dll"

-

-	SetOutPath "$INSTDIR\PyQt5\Qt\plugins\printsupport"

-	File "${BINPATH}\PyQt5\Qt\plugins\printsupport\windowsprintersupport.dll"

-

-	SetOutPath "$INSTDIR\share"

-	File "${BINPATH}\share\license.txt"

-	File "${BINPATH}\share\torrc_template"

-	File "${BINPATH}\share\torrc_template-windows"

-	File "${BINPATH}\share\version.txt"

-	File "${BINPATH}\share\wordlist.txt"

-

-	SetOutPath "$INSTDIR\share\html"

-	File "${BINPATH}\share\html\404.html"

-	File "${BINPATH}\share\html\denied.html"

-	File "${BINPATH}\share\html\index.html"

-

-	SetOutPath "$INSTDIR\share\images"

-	File "${BINPATH}\share\images\drop_files.png"

-	File "${BINPATH}\share\images\logo.png"

-	File "${BINPATH}\share\images\logo_grayscale.png"

-	File "${BINPATH}\share\images\server_started.png"

-	File "${BINPATH}\share\images\server_stopped.png"

-	File "${BINPATH}\share\images\server_working.png"

-	File "${BINPATH}\share\images\settings.png"

-	File "${BINPATH}\share\images\settings_inactive.png"

-

-	SetOutPath "$INSTDIR\share\locale"

-	File "${BINPATH}\share\locale\cs.json"

-	File "${BINPATH}\share\locale\de.json"

-	File "${BINPATH}\share\locale\en.json"

-	File "${BINPATH}\share\locale\eo.json"

-	File "${BINPATH}\share\locale\es.json"

-	File "${BINPATH}\share\locale\fi.json"

-	File "${BINPATH}\share\locale\fr.json"

-	File "${BINPATH}\share\locale\it.json"

-	File "${BINPATH}\share\locale\nl.json"

-	File "${BINPATH}\share\locale\no.json"

-	File "${BINPATH}\share\locale\pt.json"

-	File "${BINPATH}\share\locale\ru.json"

-	File "${BINPATH}\share\locale\tr.json"

-

-	SetOutPath "$INSTDIR\tor\Data\Tor"

-	File "${BINPATH}\tor\Data\Tor\geoip"

-	File "${BINPATH}\tor\Data\Tor\geoip6"

-

-	SetOutPath "$INSTDIR\tor\Tor"

-	File "${BINPATH}\tor\Tor\libeay32.dll"

-	File "${BINPATH}\tor\Tor\libevent-2-0-5.dll"

-	File "${BINPATH}\tor\Tor\libevent_core-2-0-5.dll"

-	File "${BINPATH}\tor\Tor\libevent_extra-2-0-5.dll"

-	File "${BINPATH}\tor\Tor\libgcc_s_sjlj-1.dll"

-	File "${BINPATH}\tor\Tor\libssp-0.dll"

-	File "${BINPATH}\tor\Tor\ssleay32.dll"

-	File "${BINPATH}\tor\Tor\tor.exe"

-	File "${BINPATH}\tor\Tor\zlib1.dll"

-

-    # 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

-        Delete "$INSTDIR\api-ms-win-core-console-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-datetime-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-debug-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-errorhandling-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-file-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-file-l1-2-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-file-l2-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-handle-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-heap-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-interlocked-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-libraryloader-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-localization-l1-2-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-memory-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-namedpipe-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-processenvironment-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-processthreads-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-processthreads-l1-1-1.dll"

-		Delete "$INSTDIR\api-ms-win-core-profile-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-rtlsupport-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-string-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-synch-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-synch-l1-2-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-sysinfo-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-timezone-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-core-util-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-crt-conio-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-crt-convert-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-crt-environment-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-crt-filesystem-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-crt-heap-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-crt-locale-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-crt-math-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-crt-multibyte-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-crt-process-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-crt-runtime-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-crt-stdio-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-crt-string-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-crt-time-l1-1-0.dll"

-		Delete "$INSTDIR\api-ms-win-crt-utility-l1-1-0.dll"

-		Delete "$INSTDIR\base_library.zip"

-		Delete "$INSTDIR\Include\pyconfig.h"

-		Delete "$INSTDIR\lib2to3\Grammar.txt"

-		Delete "$INSTDIR\lib2to3\Grammar3.6.2.candidate.2.pickle"

-		Delete "$INSTDIR\lib2to3\Grammar3.6.2.final.0.pickle"

-		Delete "$INSTDIR\lib2to3\Grammar3.6.3.candidate.1.pickle"

-		Delete "$INSTDIR\lib2to3\Grammar3.6.3.final.0.pickle"

-		Delete "$INSTDIR\lib2to3\Grammar3.6.4.candidate.1.pickle"

-		Delete "$INSTDIR\lib2to3\Grammar3.6.4.final.0.pickle"

-		Delete "$INSTDIR\lib2to3\PatternGrammar.txt"

-		Delete "$INSTDIR\lib2to3\PatternGrammar3.6.2.candidate.2.pickle"

-		Delete "$INSTDIR\lib2to3\PatternGrammar3.6.2.final.0.pickle"

-		Delete "$INSTDIR\lib2to3\PatternGrammar3.6.3.candidate.1.pickle"

-		Delete "$INSTDIR\lib2to3\PatternGrammar3.6.3.final.0.pickle"

-		Delete "$INSTDIR\lib2to3\PatternGrammar3.6.4.candidate.1.pickle"

-		Delete "$INSTDIR\lib2to3\PatternGrammar3.6.4.final.0.pickle"

-		Delete "$INSTDIR\lib2to3\tests"

-		Delete "$INSTDIR\lib2to3\tests\data"

-		Delete "$INSTDIR\lib2to3\tests\data\README"

-		Delete "$INSTDIR\mfc140u.dll"

-		Delete "$INSTDIR\MSVCP140.dll"

-		Delete "$INSTDIR\onionshare-gui.exe"

-		Delete "$INSTDIR\onionshare-gui.exe.manifest"

-		Delete "$INSTDIR\pyexpat.pyd"

-		Delete "$INSTDIR\PyQt5\Qt\bin\qt.conf"

-		Delete "$INSTDIR\PyQt5\Qt\plugins\iconengines\qsvgicon.dll"

-		Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qgif.dll"

-		Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qicns.dll"

-		Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qico.dll"

-		Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qjpeg.dll"

-		Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qsvg.dll"

-		Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qtga.dll"

-		Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qtiff.dll"

-		Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qwbmp.dll"

-		Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qwebp.dll"

-		Delete "$INSTDIR\PyQt5\Qt\plugins\platforms\qminimal.dll"

-		Delete "$INSTDIR\PyQt5\Qt\plugins\platforms\qoffscreen.dll"

-		Delete "$INSTDIR\PyQt5\Qt\plugins\platforms\qwindows.dll"

-		Delete "$INSTDIR\PyQt5\Qt\plugins\printsupport\windowsprintersupport.dll"

-		Delete "$INSTDIR\PyQt5.Qt.pyd"

-		Delete "$INSTDIR\PyQt5.QtCore.pyd"

-		Delete "$INSTDIR\PyQt5.QtGui.pyd"

-		Delete "$INSTDIR\PyQt5.QtPrintSupport.pyd"

-		Delete "$INSTDIR\PyQt5.QtWidgets.pyd"

-		Delete "$INSTDIR\python3.dll"

-		Delete "$INSTDIR\python36.dll"

-		Delete "$INSTDIR\pythoncom36.dll"

-		Delete "$INSTDIR\pywintypes36.dll"

-		Delete "$INSTDIR\Qt5Core.dll"

-		Delete "$INSTDIR\Qt5Gui.dll"

-		Delete "$INSTDIR\Qt5PrintSupport.dll"

-		Delete "$INSTDIR\Qt5Svg.dll"

-		Delete "$INSTDIR\Qt5Widgets.dll"

-		Delete "$INSTDIR\select.pyd"

-		Delete "$INSTDIR\share\html\404.html"

-		Delete "$INSTDIR\share\html\denied.html"

-		Delete "$INSTDIR\share\html\index.html"

-		Delete "$INSTDIR\share\images\drop_files.png"

-		Delete "$INSTDIR\share\images\logo.png"

-		Delete "$INSTDIR\share\images\logo_grayscale.png"

-		Delete "$INSTDIR\share\images\server_started.png"

-		Delete "$INSTDIR\share\images\server_stopped.png"

-		Delete "$INSTDIR\share\images\server_working.png"

-		Delete "$INSTDIR\share\images\settings.png"

-		Delete "$INSTDIR\share\images\settings_inactive.png"

-		Delete "$INSTDIR\share\license.txt"

-		Delete "$INSTDIR\share\locale\cs.json"

-		Delete "$INSTDIR\share\locale\de.json"

-		Delete "$INSTDIR\share\locale\en.json"

-		Delete "$INSTDIR\share\locale\eo.json"

-		Delete "$INSTDIR\share\locale\es.json"

-		Delete "$INSTDIR\share\locale\fi.json"

-		Delete "$INSTDIR\share\locale\fr.json"

-		Delete "$INSTDIR\share\locale\it.json"

-		Delete "$INSTDIR\share\locale\nl.json"

-		Delete "$INSTDIR\share\locale\no.json"

-		Delete "$INSTDIR\share\locale\pt.json"

-		Delete "$INSTDIR\share\locale\ru.json"

-		Delete "$INSTDIR\share\locale\tr.json"

-		Delete "$INSTDIR\share\torrc_template"

-		Delete "$INSTDIR\share\torrc_template-windows"

-		Delete "$INSTDIR\share\version.txt"

-		Delete "$INSTDIR\share\wordlist.txt"

-		Delete "$INSTDIR\sip.pyd"

-		Delete "$INSTDIR\tor\Data\Tor\geoip"

-		Delete "$INSTDIR\tor\Data\Tor\geoip6"

-		Delete "$INSTDIR\tor\Tor\libeay32.dll"

-		Delete "$INSTDIR\tor\Tor\libevent-2-0-5.dll"

-		Delete "$INSTDIR\tor\Tor\libevent_core-2-0-5.dll"

-		Delete "$INSTDIR\tor\Tor\libevent_extra-2-0-5.dll"

-		Delete "$INSTDIR\tor\Tor\libgcc_s_sjlj-1.dll"

-		Delete "$INSTDIR\tor\Tor\libssp-0.dll"

-		Delete "$INSTDIR\tor\Tor\ssleay32.dll"

-		Delete "$INSTDIR\tor\Tor\tor.exe"

-		Delete "$INSTDIR\tor\Tor\zlib1.dll"

-		Delete "$INSTDIR\ucrtbase.dll"

-		Delete "$INSTDIR\unicodedata.pyd"

-		Delete "$INSTDIR\VCRUNTIME140.dll"

-		Delete "$INSTDIR\win32api.pyd"

-		Delete "$INSTDIR\win32com.shell.shell.pyd"

-		Delete "$INSTDIR\win32trace.pyd"

-		Delete "$INSTDIR\win32ui.pyd"

-		Delete "$INSTDIR\win32wnet.pyd"

-		Delete "$INSTDIR\_asyncio.pyd"

-		Delete "$INSTDIR\_bz2.pyd"

-		Delete "$INSTDIR\_ctypes.pyd"

-		Delete "$INSTDIR\_decimal.pyd"

-		Delete "$INSTDIR\_hashlib.pyd"

-		Delete "$INSTDIR\_lzma.pyd"

-		Delete "$INSTDIR\_multiprocessing.pyd"

-		Delete "$INSTDIR\_overlapped.pyd"

-		Delete "$INSTDIR\_socket.pyd"

-		Delete "$INSTDIR\_ssl.pyd"

-		Delete "$INSTDIR\_win32sysloader.pyd"

-

-        Delete "$INSTDIR\onionshare.ico"

-        Delete "$INSTDIR\uninstall.exe"

-

-        rmDir "$INSTDIR\Include"

-		rmDir "$INSTDIR\lib2to3\tests\data"

-		rmDir "$INSTDIR\lib2to3\tests"

-		rmDir "$INSTDIR\lib2to3"

-		rmDir "$INSTDIR\PyQt5\Qt\bin"

-		rmDir "$INSTDIR\PyQt5\Qt\plugins\iconengines"

-		rmDir "$INSTDIR\PyQt5\Qt\plugins\imageformats"

-		rmDir "$INSTDIR\PyQt5\Qt\plugins\platforms"

-		rmDir "$INSTDIR\PyQt5\Qt\plugins\printsupport"

-		rmDir "$INSTDIR\PyQt5\Qt\plugins"

-		rmDir "$INSTDIR\PyQt5\Qt"

-		rmDir "$INSTDIR\PyQt5"

-		rmDir "$INSTDIR\share\html"

-		rmDir "$INSTDIR\share\images"

-		rmDir "$INSTDIR\share\locale"

-		rmDir "$INSTDIR\share"

-		rmDir "$INSTDIR\tor\Data\Tor"

-		rmDir "$INSTDIR\tor\Data"

-		rmDir "$INSTDIR\tor\Tor"

-		rmDir "$INSTDIR\tor"

-        rmDir "$INSTDIR"

-

-        # remove uninstaller information from the registry

-        DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}"

-    SectionEnd

-!endif

+!define APPNAME "OnionShare"
+!define BINPATH "..\dist\onionshare"
+!define ABOUTURL "https:\\onionshare.org\"
+
+# change these with each release
+!define INSTALLSIZE 54112
+!define VERSIONMAJOR 1
+!define VERSIONMINOR 1
+!define VERSIONSTRING "1.1"
+
+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/ /fd sha256 $%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 "${BINPATH}\api-ms-win-core-console-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-datetime-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-debug-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-errorhandling-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-file-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-file-l1-2-0.dll"
+    File "${BINPATH}\api-ms-win-core-file-l2-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-handle-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-heap-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-interlocked-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-libraryloader-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-localization-l1-2-0.dll"
+    File "${BINPATH}\api-ms-win-core-memory-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-namedpipe-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-processenvironment-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-processthreads-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-processthreads-l1-1-1.dll"
+    File "${BINPATH}\api-ms-win-core-profile-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-rtlsupport-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-string-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-synch-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-synch-l1-2-0.dll"
+    File "${BINPATH}\api-ms-win-core-sysinfo-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-timezone-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-core-util-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-crt-conio-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-crt-convert-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-crt-environment-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-crt-filesystem-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-crt-heap-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-crt-locale-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-crt-math-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-crt-multibyte-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-crt-process-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-crt-runtime-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-crt-stdio-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-crt-string-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-crt-time-l1-1-0.dll"
+    File "${BINPATH}\api-ms-win-crt-utility-l1-1-0.dll"
+    File "${BINPATH}\base_library.zip"
+    File "${BINPATH}\mfc140u.dll"
+    File "${BINPATH}\MSVCP140.dll"
+    File "${BINPATH}\onionshare-gui.exe"
+    File "${BINPATH}\onionshare-gui.exe.manifest"
+    File "${BINPATH}\pyexpat.pyd"
+    File "${BINPATH}\PyQt5.Qt.pyd"
+    File "${BINPATH}\PyQt5.QtCore.pyd"
+    File "${BINPATH}\PyQt5.QtGui.pyd"
+    File "${BINPATH}\PyQt5.QtPrintSupport.pyd"
+    File "${BINPATH}\PyQt5.QtWidgets.pyd"
+    File "${BINPATH}\python3.dll"
+    File "${BINPATH}\python36.dll"
+    File "${BINPATH}\pythoncom36.dll"
+    File "${BINPATH}\pywintypes36.dll"
+    File "${BINPATH}\Qt5Core.dll"
+    File "${BINPATH}\Qt5Gui.dll"
+    File "${BINPATH}\Qt5PrintSupport.dll"
+    File "${BINPATH}\Qt5Svg.dll"
+    File "${BINPATH}\Qt5Widgets.dll"
+    File "${BINPATH}\select.pyd"
+    File "${BINPATH}\sip.pyd"
+    File "${BINPATH}\ucrtbase.dll"
+    File "${BINPATH}\unicodedata.pyd"
+    File "${BINPATH}\VCRUNTIME140.dll"
+    File "${BINPATH}\win32api.pyd"
+    File "${BINPATH}\win32com.shell.shell.pyd"
+    File "${BINPATH}\win32trace.pyd"
+    File "${BINPATH}\win32ui.pyd"
+    File "${BINPATH}\win32wnet.pyd"
+    File "${BINPATH}\_asyncio.pyd"
+    File "${BINPATH}\_bz2.pyd"
+    File "${BINPATH}\_ctypes.pyd"
+    File "${BINPATH}\_decimal.pyd"
+    File "${BINPATH}\_hashlib.pyd"
+    File "${BINPATH}\_lzma.pyd"
+    File "${BINPATH}\_multiprocessing.pyd"
+    File "${BINPATH}\_overlapped.pyd"
+    File "${BINPATH}\_socket.pyd"
+    File "${BINPATH}\_ssl.pyd"
+    File "${BINPATH}\_win32sysloader.pyd"
+
+    SetOutPath "$INSTDIR\Include"
+    File "${BINPATH}\Include\pyconfig.h"
+
+    SetOutPath "$INSTDIR\lib2to3"
+    File "${BINPATH}\lib2to3\Grammar.txt"
+    File "${BINPATH}\lib2to3\Grammar3.6.2.candidate.2.pickle"
+    File "${BINPATH}\lib2to3\Grammar3.6.2.final.0.pickle"
+    File "${BINPATH}\lib2to3\Grammar3.6.3.candidate.1.pickle"
+    File "${BINPATH}\lib2to3\Grammar3.6.3.final.0.pickle"
+    File "${BINPATH}\lib2to3\Grammar3.6.4.candidate.1.pickle"
+    File "${BINPATH}\lib2to3\Grammar3.6.4.final.0.pickle"
+    File "${BINPATH}\lib2to3\PatternGrammar.txt"
+    File "${BINPATH}\lib2to3\PatternGrammar3.6.2.candidate.2.pickle"
+    File "${BINPATH}\lib2to3\PatternGrammar3.6.2.final.0.pickle"
+    File "${BINPATH}\lib2to3\PatternGrammar3.6.3.candidate.1.pickle"
+    File "${BINPATH}\lib2to3\PatternGrammar3.6.3.final.0.pickle"
+    File "${BINPATH}\lib2to3\PatternGrammar3.6.4.candidate.1.pickle"
+    File "${BINPATH}\lib2to3\PatternGrammar3.6.4.final.0.pickle"
+
+    SetOutPath "$INSTDIR\lib2to3\tests\data"
+    File "${BINPATH}\lib2to3\tests\data\README"
+
+    SetOutPath "$INSTDIR\PyQt5\Qt\bin"
+    File "${BINPATH}\PyQt5\Qt\bin\qt.conf"
+
+    SetOutPath "$INSTDIR\PyQt5\Qt\plugins\iconengines"
+    File "${BINPATH}\PyQt5\Qt\plugins\iconengines\qsvgicon.dll"
+
+    SetOutPath "$INSTDIR\PyQt5\Qt\plugins\imageformats"
+    File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qgif.dll"
+    File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qicns.dll"
+    File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qico.dll"
+    File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qjpeg.dll"
+    File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qsvg.dll"
+    File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qtga.dll"
+    File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qtiff.dll"
+    File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qwbmp.dll"
+    File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qwebp.dll"
+
+    SetOutPath "$INSTDIR\PyQt5\Qt\plugins\platforms"
+    File "${BINPATH}\PyQt5\Qt\plugins\platforms\qminimal.dll"
+    File "${BINPATH}\PyQt5\Qt\plugins\platforms\qoffscreen.dll"
+    File "${BINPATH}\PyQt5\Qt\plugins\platforms\qwindows.dll"
+
+    SetOutPath "$INSTDIR\PyQt5\Qt\plugins\printsupport"
+    File "${BINPATH}\PyQt5\Qt\plugins\printsupport\windowsprintersupport.dll"
+
+    SetOutPath "$INSTDIR\share"
+    File "${BINPATH}\share\license.txt"
+    File "${BINPATH}\share\torrc_template"
+    File "${BINPATH}\share\torrc_template-windows"
+    File "${BINPATH}\share\torrc_template-obfs4"
+    File "${BINPATH}\share\version.txt"
+    File "${BINPATH}\share\wordlist.txt"
+
+    SetOutPath "$INSTDIR\share\html"
+    File "${BINPATH}\share\html\404.html"
+    File "${BINPATH}\share\html\denied.html"
+    File "${BINPATH}\share\html\index.html"
+
+    SetOutPath "$INSTDIR\share\images"
+    File "${BINPATH}\share\images\drop_files.png"
+    File "${BINPATH}\share\images\logo.png"
+    File "${BINPATH}\share\images\logo_grayscale.png"
+    File "${BINPATH}\share\images\server_started.png"
+    File "${BINPATH}\share\images\server_stopped.png"
+    File "${BINPATH}\share\images\server_working.png"
+    File "${BINPATH}\share\images\settings.png"
+    File "${BINPATH}\share\images\settings_inactive.png"
+
+    SetOutPath "$INSTDIR\share\locale"
+    File "${BINPATH}\share\locale\cs.json"
+    File "${BINPATH}\share\locale\de.json"
+    File "${BINPATH}\share\locale\en.json"
+    File "${BINPATH}\share\locale\eo.json"
+    File "${BINPATH}\share\locale\es.json"
+    File "${BINPATH}\share\locale\fi.json"
+    File "${BINPATH}\share\locale\fr.json"
+    File "${BINPATH}\share\locale\it.json"
+    File "${BINPATH}\share\locale\nl.json"
+    File "${BINPATH}\share\locale\no.json"
+    File "${BINPATH}\share\locale\pt.json"
+    File "${BINPATH}\share\locale\ru.json"
+    File "${BINPATH}\share\locale\tr.json"
+
+    SetOutPath "$INSTDIR\tor\Data\Tor"
+    File "${BINPATH}\tor\Data\Tor\geoip"
+    File "${BINPATH}\tor\Data\Tor\geoip6"
+
+    SetOutPath "$INSTDIR\tor\Tor"
+    File "${BINPATH}\tor\Tor\libeay32.dll"
+    File "${BINPATH}\tor\Tor\libevent-2-0-5.dll"
+    File "${BINPATH}\tor\Tor\libevent_core-2-0-5.dll"
+    File "${BINPATH}\tor\Tor\libevent_extra-2-0-5.dll"
+    File "${BINPATH}\tor\Tor\libgcc_s_sjlj-1.dll"
+    File "${BINPATH}\tor\Tor\libssp-0.dll"
+    File "${BINPATH}\tor\Tor\obfs4proxy.exe"
+    File "${BINPATH}\tor\Tor\ssleay32.dll"
+    File "${BINPATH}\tor\Tor\tor.exe"
+    File "${BINPATH}\tor\Tor\zlib1.dll"
+
+    # 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
+        Delete "$INSTDIR\api-ms-win-core-console-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-datetime-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-debug-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-errorhandling-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-file-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-file-l1-2-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-file-l2-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-handle-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-heap-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-interlocked-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-libraryloader-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-localization-l1-2-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-memory-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-namedpipe-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-processenvironment-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-processthreads-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-processthreads-l1-1-1.dll"
+        Delete "$INSTDIR\api-ms-win-core-profile-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-rtlsupport-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-string-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-synch-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-synch-l1-2-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-sysinfo-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-timezone-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-core-util-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-crt-conio-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-crt-convert-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-crt-environment-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-crt-filesystem-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-crt-heap-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-crt-locale-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-crt-math-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-crt-multibyte-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-crt-process-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-crt-runtime-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-crt-stdio-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-crt-string-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-crt-time-l1-1-0.dll"
+        Delete "$INSTDIR\api-ms-win-crt-utility-l1-1-0.dll"
+        Delete "$INSTDIR\base_library.zip"
+        Delete "$INSTDIR\Include\pyconfig.h"
+        Delete "$INSTDIR\lib2to3\Grammar.txt"
+        Delete "$INSTDIR\lib2to3\Grammar3.6.2.candidate.2.pickle"
+        Delete "$INSTDIR\lib2to3\Grammar3.6.2.final.0.pickle"
+        Delete "$INSTDIR\lib2to3\Grammar3.6.3.candidate.1.pickle"
+        Delete "$INSTDIR\lib2to3\Grammar3.6.3.final.0.pickle"
+        Delete "$INSTDIR\lib2to3\Grammar3.6.4.candidate.1.pickle"
+        Delete "$INSTDIR\lib2to3\Grammar3.6.4.final.0.pickle"
+        Delete "$INSTDIR\lib2to3\PatternGrammar.txt"
+        Delete "$INSTDIR\lib2to3\PatternGrammar3.6.2.candidate.2.pickle"
+        Delete "$INSTDIR\lib2to3\PatternGrammar3.6.2.final.0.pickle"
+        Delete "$INSTDIR\lib2to3\PatternGrammar3.6.3.candidate.1.pickle"
+        Delete "$INSTDIR\lib2to3\PatternGrammar3.6.3.final.0.pickle"
+        Delete "$INSTDIR\lib2to3\PatternGrammar3.6.4.candidate.1.pickle"
+        Delete "$INSTDIR\lib2to3\PatternGrammar3.6.4.final.0.pickle"
+        Delete "$INSTDIR\lib2to3\tests"
+        Delete "$INSTDIR\lib2to3\tests\data"
+        Delete "$INSTDIR\lib2to3\tests\data\README"
+        Delete "$INSTDIR\mfc140u.dll"
+        Delete "$INSTDIR\MSVCP140.dll"
+        Delete "$INSTDIR\onionshare-gui.exe"
+        Delete "$INSTDIR\onionshare-gui.exe.manifest"
+        Delete "$INSTDIR\pyexpat.pyd"
+        Delete "$INSTDIR\PyQt5\Qt\bin\qt.conf"
+        Delete "$INSTDIR\PyQt5\Qt\plugins\iconengines\qsvgicon.dll"
+        Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qgif.dll"
+        Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qicns.dll"
+        Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qico.dll"
+        Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qjpeg.dll"
+        Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qsvg.dll"
+        Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qtga.dll"
+        Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qtiff.dll"
+        Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qwbmp.dll"
+        Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qwebp.dll"
+        Delete "$INSTDIR\PyQt5\Qt\plugins\platforms\qminimal.dll"
+        Delete "$INSTDIR\PyQt5\Qt\plugins\platforms\qoffscreen.dll"
+        Delete "$INSTDIR\PyQt5\Qt\plugins\platforms\qwindows.dll"
+        Delete "$INSTDIR\PyQt5\Qt\plugins\printsupport\windowsprintersupport.dll"
+        Delete "$INSTDIR\PyQt5.Qt.pyd"
+        Delete "$INSTDIR\PyQt5.QtCore.pyd"
+        Delete "$INSTDIR\PyQt5.QtGui.pyd"
+        Delete "$INSTDIR\PyQt5.QtPrintSupport.pyd"
+        Delete "$INSTDIR\PyQt5.QtWidgets.pyd"
+        Delete "$INSTDIR\python3.dll"
+        Delete "$INSTDIR\python36.dll"
+        Delete "$INSTDIR\pythoncom36.dll"
+        Delete "$INSTDIR\pywintypes36.dll"
+        Delete "$INSTDIR\Qt5Core.dll"
+        Delete "$INSTDIR\Qt5Gui.dll"
+        Delete "$INSTDIR\Qt5PrintSupport.dll"
+        Delete "$INSTDIR\Qt5Svg.dll"
+        Delete "$INSTDIR\Qt5Widgets.dll"
+        Delete "$INSTDIR\select.pyd"
+        Delete "$INSTDIR\share\html\404.html"
+        Delete "$INSTDIR\share\html\denied.html"
+        Delete "$INSTDIR\share\html\index.html"
+        Delete "$INSTDIR\share\images\drop_files.png"
+        Delete "$INSTDIR\share\images\logo.png"
+        Delete "$INSTDIR\share\images\logo_grayscale.png"
+        Delete "$INSTDIR\share\images\server_started.png"
+        Delete "$INSTDIR\share\images\server_stopped.png"
+        Delete "$INSTDIR\share\images\server_working.png"
+        Delete "$INSTDIR\share\images\settings.png"
+        Delete "$INSTDIR\share\images\settings_inactive.png"
+        Delete "$INSTDIR\share\license.txt"
+        Delete "$INSTDIR\share\locale\cs.json"
+        Delete "$INSTDIR\share\locale\de.json"
+        Delete "$INSTDIR\share\locale\en.json"
+        Delete "$INSTDIR\share\locale\eo.json"
+        Delete "$INSTDIR\share\locale\es.json"
+        Delete "$INSTDIR\share\locale\fi.json"
+        Delete "$INSTDIR\share\locale\fr.json"
+        Delete "$INSTDIR\share\locale\it.json"
+        Delete "$INSTDIR\share\locale\nl.json"
+        Delete "$INSTDIR\share\locale\no.json"
+        Delete "$INSTDIR\share\locale\pt.json"
+        Delete "$INSTDIR\share\locale\ru.json"
+        Delete "$INSTDIR\share\locale\tr.json"
+        Delete "$INSTDIR\share\torrc_template"
+        Delete "$INSTDIR\share\torrc_template-windows"
+        Delete "$INSTDIR\share\torrc_template-obfs4"
+        Delete "$INSTDIR\share\version.txt"
+        Delete "$INSTDIR\share\wordlist.txt"
+        Delete "$INSTDIR\sip.pyd"
+        Delete "$INSTDIR\tor\Data\Tor\geoip"
+        Delete "$INSTDIR\tor\Data\Tor\geoip6"
+        Delete "$INSTDIR\tor\Tor\libeay32.dll"
+        Delete "$INSTDIR\tor\Tor\libevent-2-0-5.dll"
+        Delete "$INSTDIR\tor\Tor\libevent_core-2-0-5.dll"
+        Delete "$INSTDIR\tor\Tor\libevent_extra-2-0-5.dll"
+        Delete "$INSTDIR\tor\Tor\libgcc_s_sjlj-1.dll"
+        Delete "$INSTDIR\tor\Tor\libssp-0.dll"
+        Delete "$INSTDIR\tor\Tor\obfs4proxy.exe"
+        Delete "$INSTDIR\tor\Tor\ssleay32.dll"
+        Delete "$INSTDIR\tor\Tor\tor.exe"
+        Delete "$INSTDIR\tor\Tor\zlib1.dll"
+        Delete "$INSTDIR\ucrtbase.dll"
+        Delete "$INSTDIR\unicodedata.pyd"
+        Delete "$INSTDIR\VCRUNTIME140.dll"
+        Delete "$INSTDIR\win32api.pyd"
+        Delete "$INSTDIR\win32com.shell.shell.pyd"
+        Delete "$INSTDIR\win32trace.pyd"
+        Delete "$INSTDIR\win32ui.pyd"
+        Delete "$INSTDIR\win32wnet.pyd"
+        Delete "$INSTDIR\_asyncio.pyd"
+        Delete "$INSTDIR\_bz2.pyd"
+        Delete "$INSTDIR\_ctypes.pyd"
+        Delete "$INSTDIR\_decimal.pyd"
+        Delete "$INSTDIR\_hashlib.pyd"
+        Delete "$INSTDIR\_lzma.pyd"
+        Delete "$INSTDIR\_multiprocessing.pyd"
+        Delete "$INSTDIR\_overlapped.pyd"
+        Delete "$INSTDIR\_socket.pyd"
+        Delete "$INSTDIR\_ssl.pyd"
+        Delete "$INSTDIR\_win32sysloader.pyd"
+
+        Delete "$INSTDIR\onionshare.ico"
+        Delete "$INSTDIR\uninstall.exe"
+
+        rmDir "$INSTDIR\Include"
+        rmDir "$INSTDIR\lib2to3\tests\data"
+        rmDir "$INSTDIR\lib2to3\tests"
+        rmDir "$INSTDIR\lib2to3"
+        rmDir "$INSTDIR\PyQt5\Qt\bin"
+        rmDir "$INSTDIR\PyQt5\Qt\plugins\iconengines"
+        rmDir "$INSTDIR\PyQt5\Qt\plugins\imageformats"
+        rmDir "$INSTDIR\PyQt5\Qt\plugins\platforms"
+        rmDir "$INSTDIR\PyQt5\Qt\plugins\printsupport"
+        rmDir "$INSTDIR\PyQt5\Qt\plugins"
+        rmDir "$INSTDIR\PyQt5\Qt"
+        rmDir "$INSTDIR\PyQt5"
+        rmDir "$INSTDIR\share\html"
+        rmDir "$INSTDIR\share\images"
+        rmDir "$INSTDIR\share\locale"
+        rmDir "$INSTDIR\share"
+        rmDir "$INSTDIR\tor\Data\Tor"
+        rmDir "$INSTDIR\tor\Data"
+        rmDir "$INSTDIR\tor\Tor"
+        rmDir "$INSTDIR\tor"
+        rmDir "$INSTDIR"
+
+        # remove uninstaller information from the registry
+        DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}"
+    SectionEnd
+!endif
diff --git a/install/pyinstaller.spec b/install/pyinstaller.spec
index 9ef4c0df..a38aaf6e 100644
--- a/install/pyinstaller.spec
+++ b/install/pyinstaller.spec
@@ -14,6 +14,7 @@ a = Analysis(
         ('../share/version.txt', 'share'),
         ('../share/wordlist.txt', 'share'),
         ('../share/torrc_template', 'share'),
+        ('../share/torrc_template-obfs4', 'share'),
         ('../share/torrc_template-windows', 'share'),
         ('../share/images/*', 'share/images'),
         ('../share/locale/*', 'share/locale'),