8 Dec
2011
8 Dec
'11
9:49 a.m.
commit 97bd03661c5c0b99e5a95da292954b25f885597b Merge: ae07af5 0f8026e Author: Roger Dingledine <arma@torproject.org> Date: Thu Dec 8 04:45:59 2011 -0500 Merge remote-tracking branch 'sebastian/bug4672' src/common/compat_libevent.c | 5 ++--- src/common/tortls.c | 14 ++++++++------ src/common/util.c | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-)