Merge branch 'master' into triple-des

Also moved most of the tests to the new format except for one which doesn't yet
have an obvious translation

Conflicts:
	cryptography/primitives/block/ciphers.py
	tests/primitives/test_nist.py

1 files changed, 2 insertions, 0 deletions

diff --git a/setup.py b/setup.py
index 1044c979..cbbf100a 100644
--- a/setup.py
+++ b/setup.py
@@ -21,9 +21,11 @@ with open("cryptography/__about__.py") as fp:
 
 
 CFFI_DEPENDENCY = "cffi>=0.6"
+SIX_DEPENDENCY = "six>=1.4.1"
 
 install_requires = [
     CFFI_DEPENDENCY,
+    SIX_DEPENDENCY
 ]
 
 setup_requires = [