diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-01 08:11:13 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-01 08:11:13 -0800 |
| commit | 2a160d6a159817dd9d08a84e77d102e328f9af4f (patch) | |
| tree | 461b7c607367f243bb46996ec16ad7424e48d440 /setup.py | |
| parent | 62aefffb1396190930074bf04c91459d1536bd0e (diff) | |
| parent | 522487e5a7dd3004747da85c9f6c53fc5dc4de06 (diff) | |
| download | cryptography-2a160d6a159817dd9d08a84e77d102e328f9af4f.tar.gz cryptography-2a160d6a159817dd9d08a84e77d102e328f9af4f.tar.bz2 cryptography-2a160d6a159817dd9d08a84e77d102e328f9af4f.zip | |
Merge branch 'master' into validate-iv
Conflicts:
tests/hazmat/backends/test_openssl.py
tests/hazmat/primitives/test_block.py
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions