| commit | e62760af74ebb8b08d7670dfaff177cdeb679f0f | [log] [tgz] |
|---|---|---|
| author | Julian Krause <julian.krause@gmail.com> | Wed Dec 25 12:58:40 2013 -0800 |
| committer | Julian Krause <julian.krause@gmail.com> | Wed Dec 25 12:58:40 2013 -0800 |
| tree | 70e51d6aadff7d1ec204793b12de221610204254 | |
| parent | c91fe6a21fbae3107de7b2e53b7343cd67ac8c6d [diff] | |
| parent | 0865a8b81075bfe073aba56e03cc57c30bfffe00 [diff] |
Merge branch 'master' of https://github.com/pyca/cryptography into verify Conflicts: tests/hazmat/primitives/test_hashes.py tests/hazmat/primitives/test_hmac.py