]> git.ipfire.org Git - thirdparty/squid.git/commit - src/wordlist.cc
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Wed, 14 Jan 2015 15:11:26 +0000 (07:11 -0800)
committerAmos Jeffries <squid3@treenet.co.nz>
Wed, 14 Jan 2015 15:11:26 +0000 (07:11 -0800)
commit7dcca85b904e395fd71ddb45ba20d22d77e7bfdd
tree8778ebf71b1f7ba94c14500c186f844cd0b77775
parent7e62a74f1094fd994fe1377a8e3b7fc2ccb1b85a
parent91ee0817f79140d848034828fdc263cdc79eabe2
Merge from trunk
14 files changed:
configure.ac
doc/release-notes/release-3.6.sgml
src/CachePeer.h
src/FwdState.cc
src/Makefile.am
src/PeerPoolMgr.cc
src/SquidConfig.h
src/cache_cf.cc
src/cf.data.depend
src/cf.data.pre
src/cf_gen_defines
src/ssl/PeerConnector.cc
src/ssl/support.cc
src/tunnel.cc