Merge branch 'master' of https://github.com/rthalley/dnspython into dns-over-https

diff --cc dns/query.py
Simple merge

diff --cc dns/query.pyi
index 26012e5d8abc78b67681eb9d57fe1d502e55d3b7,aeb58cb97f1a1724d76148e19bb065653d1a0af0..d3d9a48ee820fc509b80b8b2824be36562a0285c
--- 1/dns/query.pyi
--- 2/dns/query.pyi
+++ b/dns/query.pyi
@@@ -1,10 -1,14 +1,17 @@@
  from typing import Optional, Union, Dict, Generator, Any
 -from . import tsig, rdatatype, rdataclass, name, message
 +from . import message, tsig, rdatatype, rdataclass, name, message
+ 
+ try:
+     import ssl
+ except ImportError:
+     class ssl(object):
+         SSLContext = {}
+ 
 +def doh(query : message.Message, nameserver : str, post=True) -> message.Message:
 +    pass
 +
- def tcp(q : message.Message, where : str, timeout : float = None, port=53, af : Optional[int] = None, source : Optional[str] = None, source_port : int = 0,
-         one_rr_per_rrset=False) -> message.Message:
+ def tcp(q : message.Message, where : str, timeout : float = None, port=53, af : Optional[int] = None, source : Optional[str] = None, source_port : Optional[int] = 0,
+         one_rr_per_rrset : Optional[bool] = False, ignore_trailing : Optional[bool] = False) -> message.Message:
      pass
  
  def xfr(where : None, zone : Union[name.Name,str], rdtype=rdatatype.AXFR, rdclass=rdataclass.IN,