| commit | fcd36a9bb98fe6e13bc37cc833f317a3ee656eef | [log] [tgz] |
|---|---|---|
| author | David Reid <dreid@dreid.org> | Tue Nov 12 15:50:43 2013 -0800 |
| committer | David Reid <dreid@dreid.org> | Tue Nov 12 15:50:43 2013 -0800 |
| tree | adc44cfbca50c99f261c45d893d9378ea57e673b | |
| parent | 9d0d94d97cb8ed8d15b24018e20c08cf1f7b78b4 [diff] | |
| parent | 4faa094526f49c83a75d21a6e796546d4d539c6c [diff] |
Merge branch 'master' into hmac-context-from-backend Conflicts: cryptography/hazmat/bindings/openssl/backend.py cryptography/hazmat/primitives/hmac.py