Merge tag '0.66'

This brings in the rest of the 0.66 branch, including some changes new
on master.

Conflicts:
        doc/plink.but
        sshrsa.c

(The conflicts were both trivial: in one, the addition of an extra
parameter to rsa2_newkey on master happened on the line next to 0.66's
addition of a check for NULL return value, and in the other, I'd got
the version number in the plink -h transcript messed up on master.)

diff --cc doc/plink.but
Simple merge

diff --cc logging.c
Simple merge

diff --cc ssh.c
Simple merge

diff --cc sshrsa.c
index 850204c7ad1fb47f221abbd22c4b9da0a61e7ac9,5c1991effe9d265558ae2117cfada116b0142baa..e565a64ac791ff7be104a17f27814f4962f32fc7
--- 1/sshrsa.c
--- 2/sshrsa.c
+++ b/sshrsa.c
@@@ -772,7 -767,9 +772,9 @@@ static int rsa2_pubkey_bits(const struc
      struct RSAKey *rsa;
      int ret;
  
 -    rsa = rsa2_newkey((char *) blob, len);
 +    rsa = rsa2_newkey(self, (const char *) blob, len);
+     if (!rsa)
+       return -1;
      ret = bignum_bitcount(rsa->modulus);
      rsa2_freekey(rsa);
  

diff --cc terminal.c
Simple merge