Merge branch 'pre-0.67'

diff --cc Buildscr
Simple merge

diff --cc doc/plink.but
Simple merge

diff --cc misc.h
Simple merge

diff --cc pscp.c
Simple merge

diff --cc ssh.c
Simple merge

diff --cc windows/winnpc.c
index 85a3c3ffc3b6e37b252ba0c7f1d92cd41d33fa7d,5927df32f01418f5325472913952c28b7011fa1f..e5d1d7a667c5cd44b0a6fb11c103155c072f582f
--- 1/windows/winnpc.c
--- 2/windows/winnpc.c
+++ b/windows/winnpc.c
@@@ -94,9 -92,8 +92,8 @@@ Socket new_named_pipe_client(const cha
      }
  
      LocalFree(psd);
-     sfree(usersid);
  
 -    return make_handle_socket(pipehandle, pipehandle, plug, TRUE);
 +    return make_handle_socket(pipehandle, pipehandle, NULL, plug, TRUE);
  }
  
  #endif /* !defined NO_SECURITY */

diff --cc windows/winpgnt.c
Simple merge