Merge branch 'master' into rooted-and-netloc-redux

Author: wsanchez

tox.ini

@@ -32,7 +32,7 @@ basepython =
 
 deps =
     test: coverage==4.5.4  # rq.filter: <5
-    test: idna==2.8
+    test: idna==2.9
     test: typing==3.7.4.1
     test: {py26,py27,py34}: pytest==4.6.9
     test: {py35,py36,py37,py38}: pytest==5.2.4