]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge branch 'master' into fix-security-handshake 38/head
authorFrancesco Chemolli <kinkie@squid-cache.org>
Sun, 6 Aug 2017 21:46:11 +0000 (22:46 +0100)
committerGitHub <noreply@github.com>
Sun, 6 Aug 2017 21:46:11 +0000 (22:46 +0100)

Trivial merge