Merge issues.

Author: rayhayes

contrib/win32/openssh/Win32-OpenSSH.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssh", "ssh.vcxproj", "{74E69D5E-A1EF-46EA-9173-19A412774104}"
 	ProjectSection(ProjectDependencies) = postProject

contrib/win32/win32compat/shell-host.c

@@ -1117,12 +1117,6 @@ int start_with_pty(int ac, wchar_t **av) {
     // Copy our parent buffer sizes
     si.cb = sizeof(STARTUPINFO);
     si.dwFlags = 0;
-    if (fnSetWinEventHook == NULL) {
-        si.hStdInput = INVALID_HANDLE_VALUE;
-        si.hStdOutput = pipe_out;
-        si.hStdError = pipe_err;
-        si.dwFlags = STARTF_USESTDHANDLES;
-    }
 
     /* disable inheritance on pipe_in*/
     GOTO_CLEANUP_ON_FALSE(SetHandleInformation(pipe_in, HANDLE_FLAG_INHERIT, 0));