commit 514d48459786eb5a88a657b23cbee3cc5b570ce4 Merge: d094a76 b30d062 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 17 09:23:07 2013 -0500
Merge branch 'bug6826_squashed'
changes/bug6826 | 5 ++++ src/common/compat_libevent.c | 44 +---------------------------------------- 2 files changed, 7 insertions(+), 42 deletions(-)