[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug4312'

[nickm at torproject.org]

commit e5f2f10844dc2445f8cf2f0dc8ec92bc4ce65d63
Merge: b1bd30c 406ae1b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 25 17:00:47 2011 -0500

    Merge remote-tracking branch 'asn/bug4312'

 changes/bug4312              |   11 +++
 src/common/compat_libevent.c |    9 ++
 src/common/compat_libevent.h |    3 +
 src/common/tortls.c          |  169 ++++++++++++++++++++++++------------------
 src/common/tortls.h          |    5 +-
 src/or/connection_or.c       |   25 +++++--
 6 files changed, 140 insertions(+), 82 deletions(-)