commit 5a02406ae0d8059d3b0bbff51d37fcb92650274b Merge: 5bea660 0f6c021 Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 16 16:22:47 2011 -0500

Merge branch 'bug4457_022' into maint-0.2.2

changes/bug4457 | 9 +++++++++ src/common/compat_libevent.c | 19 ++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletions(-)