Merge pull request #6066 from autoexpect/add_doh