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

diff --cc dns/query.py
index 62b5014388fb3d2fe9fe2ad6f6274ca71426df60,ac15895ae1cac270186bcdf949ce10ea0c51d0bc..598fa8bd5f21deb1ad9e9105d4ad8df5f4bab8b9
--- 1/dns/query.py
--- 2/dns/query.py
+++ b/dns/query.py
@@@ -19,8 -19,8 +19,9 @@@
  
  from __future__ import generators
  
 +import urllib.request
  import errno
+ import os
  import select
  import socket
  import struct

diff --cc dns/resolver.py
Simple merge