[Pkg-privacy-commits] [onioncat] 328/340: Merge tag 'onioncat/0.2.2.r566' into debian

[Ximin Luo]

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

infinity0 pushed a commit to branch debian
in repository onioncat.

commit c4bc1149dc8c8c0c27be32c4e979fdc7f94c4757
Merge: 21c120e 1dc739e
Author: intrigeri <intrigeri at boum.org>
Date:   Mon May 4 21:58:26 2015 +0000

    Merge tag 'onioncat/0.2.2.r566' into debian
    
    Upstream version 0.2.2.r566

 INSTALL                | 207 +++++++++++++++++----
 Makefile.in            |   2 +-
 aclocal.m4             |  10 +-
 config.guess           | 490 +++++++++++++++++++++++++------------------------
 config.h.in            |   3 +
 config.sub             | 269 +++++++++++++++++++--------
 configure              | 246 +++++++++++++------------
 configure.ac           |   6 +-
 depcomp                | 265 ++++++++++++++++++--------
 i2p/Makefile.in        |   2 +-
 install-sh             |  32 ++--
 man/Makefile.in        |   2 +-
 man/ocat.1             |   2 +-
 missing                |  94 +++-------
 src/Makefile.in        |   2 +-
 src/cygwin/Makefile.in |   2 +-
 src/ocat.c             |  16 +-
 src/ocat.h             |   1 +
 src/ocat_netdesc.c     |   2 +
 src/ocat_netdesc.h     |   3 +-
 src/ocatctrl.c         |  11 ++
 src/ocathosts.c        |  26 ++-
 src/ocathosts.h        |   4 +
 src/ocatlibe.c         |   2 +-
 src/ocatroute.c        |  30 ++-
 src/ocatsetup.c        |  14 +-
 src/ocatsocks.c        |   8 +-
 src/ocatthread.c       |   6 +-
 28 files changed, 1095 insertions(+), 662 deletions(-)

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