]> git.ipfire.org Git - thirdparty/squid.git/commit
Merged from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Thu, 26 Feb 2015 10:25:12 +0000 (02:25 -0800)
committerAmos Jeffries <squid3@treenet.co.nz>
Thu, 26 Feb 2015 10:25:12 +0000 (02:25 -0800)
commit3609274174d8a46a72a2ab7e86bde1cdc38cb257
tree71babeb45260c866b6fb73f3d24f4fc03a9ff203
parent7905e7be0460433d15076d93286f52800f3e0979
parent8964d79f63ad755df358c6ce6908dd509b088ccd
Merged from trunk
16 files changed:
configure.ac
doc/release-notes/release-3.6.sgml
src/CachePeer.cc
src/CachePeer.h
src/FwdState.cc
src/Makefile.am
src/SquidConfig.h
src/cache_cf.cc
src/cf.data.depend
src/cf.data.pre
src/security/PeerOptions.cc
src/security/PeerOptions.h
src/ssl/PeerConnector.cc
src/ssl/support.cc
src/tests/stub_libsecurity.cc
src/tunnel.cc