[openssh-commits] [openssh] branch master updated (48993be -> a647b9b)

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a change to branch master
in repository openssh.

     omits  48993be   Merge branch 'master' of git.mindrot.org:/var/git/openssh
     omits  226d94d   upstream commit
     omits  0b53416   upstream commit
     omits  c7b4135   upstream commit
     omits  77199d6   upstream commit
     omits  7d53508   upstream commit
     omits  e6dc174   upstream commit
     omits  b066bbb   upstream commit
     omits  3744692   upstream commit
     omits  671eb96   upstream commit
     omits  cf7eaee   upstream commit
     omits  e9d03f2   upstream commit
     omits  af68a18   upstream commit
     omits  5781d47   upstream commit
     omits  4d4f433   upstream commit
     omits  88c2df7   upstream commit

This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.

 * -- * -- N   refs/heads/master (a647b9b)
            \
             O -- O -- O   (48993be)

Any revisions marked "omits" are not gone; other references still
refer to them.  Any revisions marked "discards" are gone forever.

No new revisions were added by this update.

Summary of changes:
 auth-options.c                         | 23 ++++++---------
 auth.c                                 |  5 ++--
 auth.h                                 |  4 +--
 auth2-hostbased.c                      |  5 ++--
 auth2-pubkey.c                         | 12 ++++----
 clientloop.c                           |  5 ++--
 compat.c                               |  7 +++--
 dispatch.c                             | 22 +++++++++++++--
 groupaccess.c                          |  6 ++--
 hostfile.c                             |  4 +--
 match.c                                | 14 ++++++----
 match.h                                |  6 ++--
 monitor.c                              | 17 ++++++------
 monitor_wrap.c                         | 15 ++++------
 monitor_wrap.h                         |  6 ++--
 mux.c                                  | 21 +++-----------
 openbsd-compat/bcrypt_pbkdf.c          | 18 ++++++------
 packet.c                               | 16 ++---------
 readconf.c                             | 16 ++++++-----
 regress/Makefile                       |  3 +-
 regress/cfgparse.sh                    | 51 ----------------------------------
 regress/unittests/sshkey/test_sshkey.c |  4 +--
 servconf.c                             | 24 ++++++++--------
 ssh.c                                  |  8 ++++--
 sshconnect2.c                          |  5 ++--
 sshd.8                                 |  6 ++--
 sshkey.c                               |  4 +--
 27 files changed, 133 insertions(+), 194 deletions(-)
 delete mode 100644 regress/cfgparse.sh

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.