[Pkg-privacy-commits] [torsocks] 33/38: Merge tag 'upstream/2.2.0_rc1' into experimental/master

[Intrigeri]

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

intrigeri pushed a commit to branch experimental/master
in repository torsocks.

commit 1d145b31d30fe8f005418230f6f0253650e08bc0
Merge: d18c017 abfa230
Author: intrigeri <intrigeri at boum.org>
Date:   Thu Jun 23 07:32:37 2016 +0000

    Merge tag 'upstream/2.2.0_rc1' into experimental/master
    
    Upstream version 2.2.0~rc1

 ChangeLog                    |   32 +
 Makefile.in                  |   57 +-
 aclocal.m4                   |   62 +-
 config/libtool.m4            | 2521 +++++++++++--------
 config/ltmain.sh             | 5533 +++++++++++++++++++++++++++---------------
 config/ltoptions.m4          |  127 +-
 config/ltversion.m4          |   12 +-
 config/test-driver           |  148 ++
 configure                    | 2139 +++++++++-------
 configure.ac                 |    4 +-
 doc/Makefile.in              |   28 +-
 doc/torsocks.1               |    6 +
 doc/torsocks.8               |    8 +
 doc/torsocks.conf            |    4 +-
 doc/torsocks.conf.5          |    7 +-
 extras/Makefile.in           |   24 +-
 include/config.h.in          |    3 +-
 src/Makefile.in              |   24 +-
 src/bin/Makefile.in          |   25 +-
 src/bin/torsocks.in          |   61 +-
 src/common/Makefile.in       |   25 +-
 src/common/compat.c          |    5 +-
 src/common/compat.h          |    9 +-
 src/common/config-file.c     |  164 +-
 src/common/config-file.h     |    4 +-
 src/common/connection.c      |    2 +-
 src/common/defaults.h        |    4 +
 src/common/log.c             |    4 +-
 src/common/onion.c           |    6 +-
 src/common/ref.h             |    5 +-
 src/common/socks5.c          |   35 +-
 src/common/utils.c           |   37 +-
 src/lib/Makefile.am          |    2 +-
 src/lib/Makefile.in          |   30 +-
 src/lib/accept.c             |   15 +-
 src/lib/connect.c            |   14 +-
 src/lib/execve.c             |   82 +
 src/lib/recv.c               |    6 +-
 src/lib/sendto.c             |    8 +-
 src/lib/socket.c             |   10 +
 src/lib/torsocks.c           |   35 +-
 src/lib/torsocks.h           |   37 +-
 tests/Makefile.am            |   31 +-
 tests/Makefile.in            |  465 +++-
 tests/run.sh                 |   21 -
 tests/test_dns.c             |    6 +-
 tests/test_fd_passing.c      |   13 +-
 tests/test_list              |   11 -
 tests/unit/Makefile.am       |   12 +
 tests/unit/Makefile.in       |  469 +++-
 tests/unit/test_connection.c |    6 +
 tests/unit/test_socks5.c     |    2 +-
 tests/utils/Makefile.in      |   24 +-
 tests/utils/tap/Makefile.in  |   26 +-
 54 files changed, 8073 insertions(+), 4377 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torsocks.git