[tor-commits] [tor/master] Merge branch 'openssl_versions_squashed'

[nickm at torproject.org]

commit b443d6a4fbfaac8d4a944d8b2a763666d1683ada
Merge: 6b9298e 5741aef
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 10 10:41:03 2012 -0500

    Merge branch 'openssl_versions_squashed'

 changes/readable_ssl_versions |    6 ++++++
 src/common/aes.c              |    3 ++-
 src/common/crypto.c           |   25 ++++++++-----------------
 src/common/crypto.h           |   32 ++++++++++++++++++++++++++++++++
 src/common/tortls.c           |   28 ++++++++++++++--------------
 5 files changed, 62 insertions(+), 32 deletions(-)