[openssh-commits] [openssh] 02/02: Merge branch 'master' of git.mindrot.org:/var/git/openssh

[git+noreply at mindrot.org]

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

dtucker pushed a commit to branch master
in repository openssh.

commit 48993be68461dcfc6f48437e059bf243f4136c4c
Merge: a647b9b 226d94d
Author: Darren Tucker <dtucker at zip.com.au>
Date:   Fri May 8 11:12:27 2015 +1000

    Merge branch 'master' of git.mindrot.org:/var/git/openssh

 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, 194 insertions(+), 133 deletions(-)

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