Fixed mergeinfo


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1434884 13f79535-47bb-0310-9956-ffa450edef68
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54324

Allow APR connector to disable TLS compression if OpenSSL supports it.



git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1434887 13f79535-47bb-0310-9956-ffa450edef68