[netty-tcnative] 01/02: Merge tag 'upstream/1.1.33.Fork23'

[Emmanuel Bourg]

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 20a0590c75395e100bce7326506522f860faf434
Merge: 8dca3e4 d9dd6a3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 3 14:02:23 2016 +0200

    Merge tag 'upstream/1.1.33.Fork23'
    
    Upstream version 1.1.33.Fork23

 boringssl-static/pom.xml                |  2 +-
 libressl-static/pom.xml                 |  2 +-
 openssl-dynamic/pom.xml                 | 40 ++++++++++++++++++++++++++++++++-
 openssl-dynamic/src/main/c/ssl.c        |  2 +-
 openssl-dynamic/src/main/c/sslcontext.c |  2 +-
 openssl-static/pom.xml                  |  2 +-
 pom.xml                                 |  8 +++----
 7 files changed, 48 insertions(+), 10 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty-tcnative.git