Merge branch '2.4' into 2.5

bitprophet · bitprophet · commit 22c20fd288c9 · 2019-06-16T13:08:11.000-04:00
diff --git a/setup.cfg b/setup.cfg
@@ -25,3 +25,4 @@ looponfailroots = tests paramiko
 # Ignore some warnings we cannot easily handle.
 filterwarnings =
     ignore::DeprecationWarning:pkg_resources
+    ignore::cryptography.utils.CryptographyDeprecationWarning
