]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk rev.14899
authorAmos Jeffries <squid3@treenet.co.nz>
Sat, 29 Oct 2016 21:51:00 +0000 (10:51 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Sat, 29 Oct 2016 21:51:00 +0000 (10:51 +1300)
1  2 
src/client_side.cc
src/security/PeerConnector.cc

Simple merge
Simple merge