Merge pull request #5404 from jefferyto/python-cryptography-2.1.4
authorHannu Nyman <hannu.nyman@iki.fi>
Wed, 10 Jan 2018 16:20:53 +0000 (18:20 +0200)
committerGitHub <noreply@github.com>
Wed, 10 Jan 2018 16:20:53 +0000 (18:20 +0200)
python-cryptography: update to 2.1.4, refresh patches


Trivial merge