[openssh/f21] (4 commits) ...Merge remote-tracking branch 'origin/master' into f21

[Petr Lautrbach]

Summary of changes:

  08fe9e8... use different values for DH for Cisco servers (#1026430) (*)
  56a647f... the .local domain example should be in ssh_config, not in s (*)
  276c16c... 6.6.1p1-9 + 0.9.3-3 (*)
  e3dc63b... Merge remote-tracking branch 'origin/master' into f21

(*) This commit already existed in another branch; no separate mail sent