Merge pull request #253 from hynek/fix-crypto-master

Fix CI tests against cryptography master