Merge remote-tracking branch 'origin/master' into thread-next

There is a global check for pthreads and therefore BFD does not need to
check for pthreads anymore itself. Check dropped.

diff --cc sysdep/unix/io.c
index 1f4eb619cfdb98ec52dae2ce6f180181389cce07,98345d58bdf9eb6523099ac750d1da9925d8134f..c319e9856097ee2f37e9614a550936f8170a339c
--- 1/sysdep/unix/io.c
--- 2/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@@ -1605,8 -1424,8 +1605,8 @@@ sk_ssh_connect(sock *s
        server_identity_is_ok = 0;
        break;
  
 -      case SSH_SERVER_FOUND_OTHER:
 +      case SSH_KNOWN_HOSTS_OTHER:
-       LOG_WARN_ABOUT_SSH_SERVER_VALIDATION(s, "The server gave use a key of a type while we had another type recorded. " \
+       LOG_WARN_ABOUT_SSH_SERVER_VALIDATION(s, "The server gave use a key of a different type than we have recorded. " \
                                             "It is a possible attack.");
        server_identity_is_ok = 0;
        break;