git.ipfire.org Git - thirdparty/squid.git/commit - src/security/PeerOptions.cc

]> git.ipfire.org Git - thirdparty/squid.git/commit - src/security/PeerOptions.cc

projects / thirdparty / squid.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9a622f3 74f35ca)

author	Amos Jeffries <squid3@treenet.co.nz>
	Sun, 28 Jun 2015 15:02:53 +0000 (08:02 -0700)
committer	Amos Jeffries <squid3@treenet.co.nz>
	Sun, 28 Jun 2015 15:02:53 +0000 (08:02 -0700)
commit	585c27ebf5f73381e605273c3b22a232f2f8f7f8
tree	06bb28f166fd583d8d0ef798109717c93fb33991	tree \| snapshot
parent	9a622f3eb79658cde733cdecf2aa6419a64fcf86	commit \| diff
parent	74f35ca845c00f3b7a5bf97b23f19ce363fede25	commit \| diff

Merged from trunk rev.14126

12 files changed:

src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/SquidConfig.h	diff1 \|	diff2 \|	blob \| history
src/adaptation/icap/ServiceRep.cc	diff1 \|	diff2 \|	blob \| history
src/anyp/PortCfg.cc	diff1 \|	diff2 \|	blob \| history
src/anyp/PortCfg.h	diff1 \|	diff2 \|	blob \| history
src/cache_cf.cc	diff1 \|	diff2 \|	blob \| history
src/security/PeerOptions.cc	diff1 \|	diff2 \|	blob \| history
src/security/PeerOptions.h	diff1 \|	diff2 \|	blob \| history
src/ssl/support.cc	diff1 \|	diff2 \|	blob \| history
src/ssl/support.h	diff1 \|	diff2 \|	blob \| history
src/tests/stub_libsecurity.cc	diff1 \|	diff2 \|	blob \| history
src/tests/stub_libsslsquid.cc	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/squid-cache/squid.git