commit a5f7a8b047e3e0e58604b054ef98b998be537523
Merge: 957cdb5 fa52b6f
Author: Nick Mathewson <[email protected]>
Date: Wed Feb 3 14:46:33 2016 -0500
Merge branch 'openssl_compat'
changes/bug17921_bug17984 | 4 ++++
src/common/aes.c | 31 +++++++++++++++----------------
src/common/aes.h | 1 -
src/common/compat_openssl.h | 2 ++
src/common/crypto.c | 4 ++++
src/common/tortls.c | 18 ++++++++++++------
src/common/tortls.h | 7 ++++---
src/test/test_crypto.c | 20 ++++++++++++++++----
src/test/test_tortls.c | 33 +++++++++++++++++++++++----------
9 files changed, 80 insertions(+), 40 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
