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

commit 1ca9e2685f6cea803ff1a36c7dbe05625e9c4b61 Merge: ad1e8b4 7607ad2 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 6 11:32:09 2012 -0400

Merge branch 'quiet_lib_versions_squashed'

changes/detect_openssl_mismatch | 4 ++++ changes/quiet_lib_init | 3 +++ src/common/aes.c | 8 ++++---- src/common/compat_libevent.c | 2 +- src/common/crypto.c | 38 ++++++++++++++++++++++++++++++++++++++ src/common/crypto.h | 1 + src/common/tortls.c | 6 +++--- src/or/main.c | 10 +++++++--- 8 files changed, 61 insertions(+), 11 deletions(-)