Merge pull request #12060 from looklookson/master
authorRosen Penev <rosenp@gmail.com>
Wed, 13 May 2020 22:22:38 +0000 (15:22 -0700)
committerGitHub <noreply@github.com>
Wed, 13 May 2020 22:22:38 +0000 (15:22 -0700)
sslh: Add http probe support


Trivial merge