This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository netty-tcnative.
commit 06cc59e17880e6fe6823752d7cbcfc8f4607b498 Merge: 97ab84b a15655e Author: Emmanuel Bourg <[email protected]> Date: Tue Aug 30 00:35:25 2016 +0200 Merge tag 'upstream/1.1.33.Fork20' Upstream version 1.1.33.Fork20 boringssl-static/pom.xml | 2 +- openssl-dynamic/pom.xml | 2 +- openssl-dynamic/src/main/c/ssl.c | 23 ++++--- openssl-dynamic/src/main/c/ssl_private.h | 8 --- openssl-dynamic/src/main/c/sslcontext.c | 73 +++++++++------------ openssl-dynamic/src/main/c/sslutils.c | 13 ++-- .../main/java/org/apache/tomcat/jni/Library.java | 6 +- .../src/main/java/org/apache/tomcat/jni/SSL.java | 4 ++ .../java/org/apache/tomcat/jni/SSLContext.java | 75 ++++++++++++++++++---- .../apache/tomcat/jni/socket/AprSocketContext.java | 26 +++++--- openssl-static/pom.xml | 2 +- pom.xml | 8 +-- 12 files changed, 145 insertions(+), 97 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty-tcnative.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
