resolve conflicts

6 files changed, 500 insertions, 449 deletions

diff --git a/install/build_exe.bat b/install/build_exe.bat
index c1b357fa..fe15c8f2 100644
--- a/install/build_exe.bat
+++ b/install/build_exe.bat
@@ -10,8 +10,8 @@ python install\get-tor-windows.py
 REM sign onionshare-gui.exe

 signtool.exe sign /v /d "OnionShare" /a /tr http://timestamp.globalsign.com/scripts/timstamp.dll /fd sha256 dist\onionshare\onionshare-gui.exe

 

-REM build an installer, dist\OnionShare_Setup.exe

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

 makensis.exe install\onionshare.nsi

 

-REM sign OnionShare_Setup.exe

-signtool.exe sign /v /d "OnionShare" /a /tr http://timestamp.globalsign.com/scripts/timstamp.dll /fd sha256 dist\OnionShare_Setup.exe

+REM sign onionshare-setup.exe

+signtool.exe sign /v /d "OnionShare" /a /tr http://timestamp.globalsign.com/scripts/timstamp.dll /fd sha256 dist\onionshare-setup.exe

diff --git a/install/check_lacked_trans.py b/install/check_lacked_trans.py
index 6dc145a7..3313db7c 100644
--- a/install/check_lacked_trans.py
+++ b/install/check_lacked_trans.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 """
@@ -36,7 +36,9 @@ def arg_parser():
     p.add_argument('-d', default='.', help='onionshare directory',
                    metavar='ONIONSHARE_DIR', dest='onionshare_dir')
     p.add_argument('--show-all-keys', action='store_true',
-                   help='show translation key in source and exit')
+                   help='show translation key in source and exit'),
+    p.add_argument('-l', default='all', help='language code (default: all)',
+                   metavar='LANG_CODE', dest='lang_code')
     return p
 
 
@@ -54,7 +56,8 @@ def main():
 
     src = files_in(dir, 'onionshare') + files_in(dir, 'onionshare_gui')
     pysrc = [p for p in src if p.endswith('.py')]
-    htmlsrc = [p for p in src if p.endswith('.html')]
+
+    lang_code = args.lang_code
 
     translate_keys = set()
     # load translate key from python source
@@ -67,20 +70,15 @@ def main():
             key = arg.split(',')[0].strip('''"' ''')
             translate_keys.add(key)
 
-    # load translate key from html source
-    for line in fileinput.input(htmlsrc, openhook=fileinput.hook_encoded('utf-8')):
-        # search `{{strings.translate_key}}`
-        m = re.search(r'{{.*strings\.([-a-zA-Z0-9_]+).*}}', line)
-        if m:
-            key = m.group(1)
-            translate_keys.add(key)
-
     if args.show_all_keys:
         for k in sorted(translate_keys):
-            print k
+            print(k)
         sys.exit()
 
-    locale_files = [f for f in files_in(dir, 'locale') if f.endswith('.json')]
+    if lang_code == 'all':
+        locale_files = [f for f in files_in(dir, 'share/locale') if f.endswith('.json')]
+    else:
+        locale_files = [f for f in files_in(dir, 'share/locale') if f.endswith('%s.json' % lang_code)]
     for locale_file in locale_files:
         with codecs.open(locale_file, 'r', encoding='utf-8') as f:
             trans = json.load(f)
@@ -92,10 +90,10 @@ def main():
 
         locale, ext = os.path.splitext(os.path.basename(locale_file))
         for k in sorted(disused):
-            print locale, 'disused', k
+            print(locale, 'disused', k)
 
         for k in sorted(lacked):
-            print locale, 'lacked', k
+            print(locale, 'lacked', k)
 
 
 if __name__ == '__main__':
diff --git a/install/onionshare.nsi b/install/onionshare.nsi
index 865f5613..57c2592c 100644
--- a/install/onionshare.nsi
+++ b/install/onionshare.nsi
@@ -1,412 +1,467 @@
-!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://timestamp.globalsign.com/scripts/timstamp.dll /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}\MSVCP140.dll"

-    File "${BINPATH}\MSVCR100.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}\python35.dll"

-    File "${BINPATH}\pywintypes35.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}\win32wnet.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}\_socket.pyd"

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

-

-    SetOutPath "$INSTDIR\Include"

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

-

-    SetOutPath "$INSTDIR\lib2to3"

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

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

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

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

-

-    SetOutPath "$INSTDIR\share"

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

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

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

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

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

-

-    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\server_started.png"

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

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

-    File "${BINPATH}\share\images\settings.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\qt5_plugins\iconengines"

-    File "${BINPATH}\qt5_plugins\iconengines\qsvgicon.dll"

-

-    SetOutPath "$INSTDIR\qt5_plugins\imageformats"

-    File "${BINPATH}\qt5_plugins\imageformats\qgif.dll"

-    File "${BINPATH}\qt5_plugins\imageformats\qicns.dll"

-    File "${BINPATH}\qt5_plugins\imageformats\qico.dll"

-    File "${BINPATH}\qt5_plugins\imageformats\qjpeg.dll"

-    File "${BINPATH}\qt5_plugins\imageformats\qsvg.dll"

-    File "${BINPATH}\qt5_plugins\imageformats\qtga.dll"

-    File "${BINPATH}\qt5_plugins\imageformats\qtiff.dll"

-    File "${BINPATH}\qt5_plugins\imageformats\qwbmp.dll"

-    File "${BINPATH}\qt5_plugins\imageformats\qwebp.dll"

-

-    SetOutPath "$INSTDIR\qt5_plugins\platforms"

-    File "${BINPATH}\qt5_plugins\platforms\qminimal.dll"

-    File "${BINPATH}\qt5_plugins\platforms\qoffscreen.dll"

-    File "${BINPATH}\qt5_plugins\platforms\qwindows.dll"

-

-    SetOutPath "$INSTDIR\qt5_plugins\printsupport"

-    File "${BINPATH}\qt5_plugins\printsupport\windowsprintersupport.dll"

-

-    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_core-2-0-5.dll"

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

-    File "${BINPATH}\tor\Tor\libevent-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\MSVCP140.dll"

-        Delete "$INSTDIR\MSVCR100.dll"

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

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

-        Delete "$INSTDIR\pyexpat.pyd"

-        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\python35.dll"

-        Delete "$INSTDIR\pywintypes35.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\sip.pyd"

-        Delete "$INSTDIR\ucrtbase.dll"

-        Delete "$INSTDIR\unicodedata.pyd"

-        Delete "$INSTDIR\VCRUNTIME140.dll"

-        Delete "$INSTDIR\win32wnet.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\_socket.pyd"

-        Delete "$INSTDIR\_ssl.pyd"

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

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

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

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

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

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

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

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

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

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

-        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\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\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\qt5_plugins\iconengines\qsvgicon.dll"

-        Delete "$INSTDIR\qt5_plugins\imageformats\qgif.dll"

-        Delete "$INSTDIR\qt5_plugins\imageformats\qicns.dll"

-        Delete "$INSTDIR\qt5_plugins\imageformats\qico.dll"

-        Delete "$INSTDIR\qt5_plugins\imageformats\qjpeg.dll"

-        Delete "$INSTDIR\qt5_plugins\imageformats\qsvg.dll"

-        Delete "$INSTDIR\qt5_plugins\imageformats\qtga.dll"

-        Delete "$INSTDIR\qt5_plugins\imageformats\qtiff.dll"

-        Delete "$INSTDIR\qt5_plugins\imageformats\qwbmp.dll"

-        Delete "$INSTDIR\qt5_plugins\imageformats\qwebp.dll"

-        Delete "$INSTDIR\qt5_plugins\platforms\qminimal.dll"

-        Delete "$INSTDIR\qt5_plugins\platforms\qoffscreen.dll"

-        Delete "$INSTDIR\qt5_plugins\platforms\qwindows.dll"

-        Delete "$INSTDIR\qt5_plugins\printsupport\windowsprintersupport.dll"

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

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

-        Delete "$INSTDIR\tor\Tor\libeay32.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\libevent-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\onionshare.ico"

-        Delete "$INSTDIR\uninstall.exe"

-

-        rmDir "$INSTDIR\Include"

-        rmDir "$INSTDIR\lib2to3"

-        rmDir "$INSTDIR\share\html"

-        rmDir "$INSTDIR\share\images"

-        rmDir "$INSTDIR\share\locale"

-        rmDir "$INSTDIR\share"

-        rmDir "$INSTDIR\qt5_plugins\iconengines"

-        rmDir "$INSTDIR\qt5_plugins\imageformats"

-        rmDir "$INSTDIR\qt5_plugins\platforms"

-        rmDir "$INSTDIR\qt5_plugins\printsupport"

-        rmDir "$INSTDIR\qt5_plugins"

-        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://timestamp.globalsign.com/scripts/timstamp.dll /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\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\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
diff --git a/install/pyinstaller.spec b/install/pyinstaller.spec
index 5922991d..a38aaf6e 100644
--- a/install/pyinstaller.spec
+++ b/install/pyinstaller.spec
@@ -23,7 +23,6 @@ a = Analysis(
     hiddenimports=[],
     hookspath=[],
     runtime_hooks=[],
-    excludes=['jinja2.asyncsupport'],
     win_no_prefer_redirects=False,
     win_private_assemblies=False,
     cipher=None)
diff --git a/install/requirements-windows.txt b/install/requirements-windows.txt
index 9c08e128..32b8da4a 100644
--- a/install/requirements-windows.txt
+++ b/install/requirements-windows.txt
@@ -1,14 +1,13 @@
 click==6.7
-Flask==0.12
+Flask==0.12.2
 future==0.16.0
 itsdangerous==0.24
-Jinja2==2.9.5
-MarkupSafe==0.23
-pefile==2016.3.28
-PyInstaller==3.2.1
-pypiwin32==219
-PyQt5==5.8
+Jinja2==2.10
+MarkupSafe==1.0
+pefile==2017.11.5
+PyInstaller==3.3.1
+PyQt5==5.9.2
 PySocks==1.6.7
-sip==4.19.1
-stem==1.5.4
-Werkzeug==0.11.15
+sip==4.19.6
+stem==1.6.0
+Werkzeug==0.14.1
diff --git a/install/requirements.txt b/install/requirements.txt
index a046504a..c7828080 100644
--- a/install/requirements.txt
+++ b/install/requirements.txt
@@ -1,11 +1,11 @@
 click==6.7
-Flask==0.12
+Flask==0.12.2
 itsdangerous==0.24
-Jinja2==2.9.5
-MarkupSafe==0.23
-PyInstaller==3.2.1
-PyQt5==5.7.1
+Jinja2==2.10
+MarkupSafe==1.0
+PyInstaller==3.3.1
+PyQt5==5.9.2
 PySocks==1.6.7
-sip==4.19
-stem==1.5.4
-Werkzeug==0.11.15
+sip==4.19.6
+stem==1.6.0
+Werkzeug==0.14.1