Moved tor binaries into subfolder "tor" for Windows build

build_scripts/Windows-msys2/build/pack.bat

@@ -132,8 +132,14 @@ del /Q "%RsDeployPath%\imageformats\*d?.dll" %Quite%
 
 if "%ParamTor%"=="1" (
 	echo copy tor
-	copy "%RsMinGWPath%\bin\tor.exe" "%RsDeployPath%" %Quite%
+	if not exist "%RsDeployPath%\tor" mkdir "%RsDeployPath%\tor"
-	copy "%RsMinGWPath%\bin\tor-gencert.exe" "%RsDeployPath%" %Quite%
+	copy "%RsMinGWPath%\bin\tor.exe" "%RsDeployPath%\tor" %Quite%
+	copy "%RsMinGWPath%\bin\tor-gencert.exe" "%RsDeployPath%\tor" %Quite%
+
+	echo copy tor dependencies
+	for /R "%RsDeployPath%\tor" %%D in (*.exe) do (
+		call :copy_dependencies "%%D" "%RsDeployPath%\tor"
+	)
 )
 
 echo copy dependencies

build_scripts/Windows/build/pack.bat

@@ -173,7 +173,8 @@ if exist "%SourcePath%\libresapi\src\webui" (
 
 if "%ParamTor%"=="1" (
 	echo copy tor
-	echo n | copy /-y "%EnvTorPath%\Tor\*.*" "%RsDeployPath%" %Quite%
+	if not exist "%RsDeployPath%\tor" mkdir "%RsDeployPath%\tor"
+	echo n | copy /-y "%EnvTorPath%\Tor\*.*" "%RsDeployPath%\tor" %Quite%
 )
 
 rem pack files

build_scripts/Windows/installer/retroshare-Qt5.nsi

@@ -285,7 +285,7 @@ SectionEnd
 # Tor
 !ifdef TOR_EXISTS
   Section /o $(Section_Tor) Section_Tor
-    SetOutPath "$INSTDIR"
+    SetOutPath "$INSTDIR\tor"
     File /r "${TORDIR}\*"
   SectionEnd
 !endif

retroshare-gui/src/TorControl/TorManager.cpp

@@ -465,7 +465,7 @@ QString TorManagerPrivate::torExecutablePath() const
         return path;
 
 #ifdef Q_OS_WIN
-    QString filename(QStringLiteral("/tor.exe"));
+    QString filename(QStringLiteral("/tor/tor.exe"));
 #else
     QString filename(QStringLiteral("/tor"));
 #endif