commit 8bb853b2a23e56505d598ee9c38ce56b4afe248c Merge: 299034e 0ebcf34 Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 7 21:12:20 2011 -0500

Merge remote-tracking branch 'public/revert_4312'

src/common/compat_libevent.c | 59 +------------- src/common/compat_libevent.h | 6 +- src/common/tortls.c | 177 +++++++++++++++++++----------------------- src/common/tortls.h | 5 +- src/common/util.c | 4 +- src/or/connection_or.c | 51 +++--------- src/or/or.h | 2 - 7 files changed, 102 insertions(+), 202 deletions(-)