Merge remote branch 'github/20_once_fixes'
authorNick Mathewson <nickm@torproject.org>
Fri, 26 Nov 2010 04:03:46 +0000 (23:03 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 26 Nov 2010 04:03:46 +0000 (23:03 -0500)
1  2 
event.c
include/event2/event.h

diff --cc event.c
Simple merge
Simple merge