[Pkg-gnupg-commit] [libassuan] 08/10: Merge tag 'upstream/2.4.2'

[Eric Dorland]

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

eric pushed a commit to branch master
in repository libassuan.

commit 1d12ec779503cb0d0e2091e0c88a0fe491105b9a
Merge: bd68e37 e5bffef
Author: Eric Dorland <eric at debian.org>
Date:   Fri Dec 4 13:47:35 2015 -0500

    Merge tag 'upstream/2.4.2'
    
    Upstream version 2.4.2
    
    # gpg: Signature made Fri 04 Dec 2015 01:47:30 PM EST using RSA key ID 00221E93
    # gpg: Good signature from "Eric Dorland <eric at kuroneko.ca>"
    # gpg:                 aka "Eric Dorland <eric at debian.org>"

 ChangeLog                   |  22 +++++++++++
 NEWS                        |  10 +++++
 VERSION                     |   2 +-
 configure                   |  30 +++++++--------
 configure.ac                |   4 +-
 doc/assuan.info             |  89 +++++++++++++++++++++++---------------------
 doc/assuan.texi             |   7 +++-
 doc/stamp-vti               |   6 +--
 doc/version.texi            |   6 +--
 src/Makefile.in             |   4 +-
 src/assuan-buffer.c         |   2 +-
 src/assuan-handler.c        |   2 +-
 src/assuan-socket-connect.c |   2 +-
 src/assuan-socket.c         |  30 ++++++++++++---
 src/assuan.h.in             |   7 +++-
 src/funopen.c               |   2 +-
 src/gpgcedev.c              |   2 +-
 src/system-w32.c            |   2 +-
 tests/fdpassing.c           |   2 +-
 tests/socks5                | Bin 56688 -> 59432 bytes
 tests/socks5.c              |  34 ++++++++++++++++-
 21 files changed, 181 insertions(+), 84 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git