Merge shorter option name from 'pre-0.64'.

diff --combined config.c
index c01c6812a90cdc7b41e9f63e389ddd248c9b9745,7e4cc242bbf01b3ad53f133769bc13924b3d40fb..e126d4dce4124f458ed319297d8de83343a2edd1
--- 1/config.c
--- 2/config.c
+++ b/config.c
@@@ -433,7 -433,6 +433,7 @@@ static void kexlist_handler(union contr
            { "Diffie-Hellman group 14",        KEX_DHGROUP14 },
            { "Diffie-Hellman group exchange",  KEX_DHGEX },
            { "RSA-based key exchange",         KEX_RSA },
 +            { "ECDH key exchange",              KEX_ECDH },
            { "-- warn below here --",          KEX_WARN }
        };
  
@@@ -2595,8 -2594,8 +2595,8 @@@ void setup_config_box(struct controlbo
            ctrl_droplist(s, "Ignores SSH-2 maximum packet size", 'x', 20,
                          HELPCTX(ssh_bugs_maxpkt2),
                          sshbug_handler, I(CONF_sshbug_maxpkt2));
-           ctrl_droplist(s, "Replies to channel requests after channel close",
-                           'q', 20, HELPCTX(ssh_bugs_chanreq),
+           ctrl_droplist(s, "Replies to requests on closed channels", 'q', 20,
+                         HELPCTX(ssh_bugs_chanreq),
                          sshbug_handler, I(CONF_sshbug_chanreq));
        }
      }