[tomcat-native] 02/04: Merge tag 'upstream/1.1.33'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to annotated tag debian/1.1.33-1
in repository tomcat-native.

commit c518820f77af832ab6a055fa6c9ff3050f23797a
Merge: 43e3c87 097bc57
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 11 13:15:58 2015 +0200

    Merge tag 'upstream/1.1.33'
    
    Upstream version 1.1.33

 CHANGELOG.txt                                      |  17 +-
 NOTICE                                             |   2 +-
 jni/build.properties.default                       |   2 +-
 jni/build.xml                                      |   4 +-
 jni/docs/index.html                                |   6 +-
 jni/docs/miscellaneous/changelog.html              |  27 +-
 jni/docs/news/2008.html                            |   2 +-
 jni/docs/news/2009.html                            |   2 +-
 jni/docs/news/2010.html                            |   2 +-
 jni/docs/news/2011.html                            |   2 +-
 jni/docs/news/2012.html                            |   2 +-
 jni/docs/news/2013.html                            |   2 +-
 jni/docs/news/2014.html                            |   8 +-
 jni/java/org/apache/tomcat/jni/Library.java        |  43 ++-
 .../apache/tomcat/jni/LibraryNotFoundError.java    |  40 +++
 jni/java/org/apache/tomcat/jni/SSL.java            |   4 +-
 jni/jnirelease.sh                                  |  18 +-
 jni/native/build/apr_common.m4                     |   7 +-
 jni/native/build/config.guess                      | 306 ++++++---------------
 jni/native/build/config.sub                        |  21 +-
 jni/native/include/ssl_private.h                   |   8 +-
 jni/native/include/tcn_version.h                   |   4 +-
 jni/native/os/win32/libtcnative.rc                 |   6 +-
 jni/native/src/jnilib.c                            |   9 +-
 jni/native/src/multicast.c                         |  12 +-
 jni/native/src/poll.c                              |  22 +-
 jni/native/src/ssl.c                               |  10 +-
 jni/native/src/sslcontext.c                        |   4 +-
 jni/native/src/sslinfo.c                           |  12 +-
 jni/native/src/sslnetwork.c                        |   6 +-
 jni/native/src/sslutils.c                          |  15 +-
 jni/native/srclib/VERSIONS                         |   2 +-
 jni/native/srclib/apr/apr-enable-ipv6.patch        |   4 +-
 jni/native/tcnative.spec                           |   2 +-
 jni/xdocs/index.xml                                |   4 +-
 jni/xdocs/miscellaneous/changelog.xml              |  26 ++
 jni/xdocs/news/2014.xml                            |   6 +
 jni/xdocs/style.xsl                                |   2 +-
 38 files changed, 345 insertions(+), 326 deletions(-)

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