diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-02 15:11:10 -0600 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-02 15:11:10 -0600 |
commit | ffa70965d610d2f4523a7d9e7ded879a06c6c2c0 (patch) | |
tree | 88c13e98d17370da0d8ca0e6459f3358197c7aa5 /tests/hazmat/primitives/test_hash_vectors.py | |
parent | b8dbb89676836db16272e0485086191263f98c45 (diff) | |
parent | c39559c6d629d68674d240d6e6bcdf44a15d90cf (diff) | |
download | cryptography-ffa70965d610d2f4523a7d9e7ded879a06c6c2c0.tar.gz cryptography-ffa70965d610d2f4523a7d9e7ded879a06c6c2c0.tar.bz2 cryptography-ffa70965d610d2f4523a7d9e7ded879a06c6c2c0.zip |
Merge branch 'master' into urandom-engine
* master:
Revert "Travis now has an up to date pypy"
Make capitalization in the glossary consistent and sort it
Make lib and ffi be private on backend
Diffstat (limited to 'tests/hazmat/primitives/test_hash_vectors.py')
0 files changed, 0 insertions, 0 deletions