resolved conflicts

Author: julianz-

setup.py

@@ -96,7 +96,7 @@ def find_meta(meta):
         packages=find_packages(where="src"),
         package_dir={"": "src"},
         install_requires=[
-            "cryptography>=42.0.0",
+	    "cryptography>=41.0.5,<43",
         ],
         extras_require={
             "test": ["flaky", "pretend", "pytest>=3.0.1"],

tox.ini

@@ -18,7 +18,7 @@ extras =
     test
 deps =
     coverage>=4.2
-    cryptographyMinimum: cryptography==41.0.3
+    cryptographyMinimum: cryptography==41.0.5
     randomorder: pytest-randomly
 setenv =
     # Do not allow the executing environment to pollute the test environment