Merge branch 'master' into rsa-pss-signing

* master:
  add mgf1_hash_supported unsupported hash check
  more concise way of generating tests
  switch to a lambda
  rename some things
  add FIPS 186-2/3 signature verification tests for RSA PKCSv15 and PSS
  revert one import order change
  a few small fixes
  Add ASN1_TIME_free
  import order fixes for future automated checking

Conflicts:
	tests/hazmat/primitives/test_rsa.py
	tests/hazmat/primitives/utils.py

1 files changed, 2 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index f8b84a3b..1dfb80db 100644
--- a/setup.py
+++ b/setup.py
@@ -17,9 +17,10 @@ import os
 import sys
 from distutils.command.build import build
 
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 from setuptools.command.test import test
 
+
 base_dir = os.path.dirname(__file__)
 
 about = {}