commit 751b3aabb5ab88fca16834e559a8d9835831b05f Merge: be33c3f be68c1f Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 4 12:50:41 2012 -0400

Merge remote-tracking branch 'public/openssl_1_is_best'

changes/dropped_openssl_vers | 3 + src/common/crypto.c | 100 ++----------- src/common/include.am | 3 +- src/common/sha256.c | 331 ------------------------------------------ src/common/tortls.c | 11 +- 5 files changed, 18 insertions(+), 430 deletions(-)