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

[nickm at torproject.org]

commit 2f3dad10a8db72fddd797f39a72c34e64cf3837f
Merge: 8200a85 7be50c2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 16 16:23:15 2011 -0500

    Merge branch 'bug4457_master'

 changes/bug4457              |    9 ++++++++
 changes/bug4457_master       |    6 +++++
 src/common/compat_libevent.c |   43 +++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 57 insertions(+), 1 deletions(-)