Merge branch 'master' into dev

Source commit: b01185b517b722b98ae0b7d86416bc9586183cf7

source/filezilla/TransferSocket.cpp

@@ -1143,7 +1143,7 @@ void CTransferSocket::CloseOnShutDownOrError(int Mode)
   {
     // It would probably be correct to remove this call, and wait for OnClose (FD_CLOSE),
     // where CloseAndEnsureSendClose is called too.
-    // See https://docs.microsoft.com/en-us/windows/desktop/winsock/graceful-shutdown-linger-options-and-socket-closure-2
+    // See https://docs.microsoft.com/en-us/windows/win32/winsock/graceful-shutdown-linger-options-and-socket-closure-2
     CloseAndEnsureSendClose(Mode);
   }
   else