[openssh-commits] [openssh] branch master updated (72ef7c1 -> 83b9678)

[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.

      from  72ef7c1   support --without-openssl at configure time
       new  6e2549a   need includes.h for portable OpenSSH
       new  0cdc5a3   unbreak across API change
       new  83b9678   fix merge botch

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Detailed log of new commits:

commit 83b9678a62cbdc74eb2031cf1e1e4ffd58e233ae
Author: Damien Miller <djm at mindrot.org>
Date:   Thu Jan 15 02:35:50 2015 +1100

    fix merge botch

commit 0cdc5a3eb6fb383569a4da2a30705d9b90428d6b
Author: Damien Miller <djm at mindrot.org>
Date:   Thu Jan 15 02:35:33 2015 +1100

    unbreak across API change

commit 6e2549ac2b5e7f96cbc2d83a6e0784b120444b47
Author: Damien Miller <djm at mindrot.org>
Date:   Thu Jan 15 02:30:18 2015 +1100

    need includes.h for portable OpenSSH

Summary of changes:
 bitmap.c                  |  2 ++
 openbsd-compat/port-tun.c | 13 +++++---
 openbsd-compat/port-tun.h |  2 +-
 sftp-server.c             | 76 ++++-------------------------------------------
 4 files changed, 18 insertions(+), 75 deletions(-)

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