[Pkg-privacy-commits] [onioncat] 308/340: Merge remote-tracking branch 'trunk' into upstream

[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 be10d87033975d21f3a0826920fa63183e07c715
Merge: 5c0290d 8dcda73
Author: intrigeri <intrigeri at boum.org>
Date:   Sat Jul 6 12:24:49 2013 +0000

    Merge remote-tracking branch 'trunk' into upstream

 Makefile.in            |  432 +++--
 aclocal.m4             |  513 ++++--
 config.h.in            |    3 +
 configure              | 4800 +++++++++++++++++++-----------------------------
 i2p/Makefile.in        |  201 +-
 man/Makefile.in        |  274 ++-
 man/ocat.1             |   20 +-
 src/Makefile.in        |  251 ++-
 src/cygwin/Makefile.in |  186 +-
 src/ocat.c             |   42 +-
 src/ocat.h             |    4 +
 src/ocatlibe.c         |    7 +
 src/ocatroute.c        |    6 +-
 src/ocatsetup.c        |    6 +-
 src/ocatsocks.c        |    4 +
 15 files changed, 3275 insertions(+), 3474 deletions(-)

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