Merge remote-tracking branch 'ghazel/event_base_active_by_fd'

author Nick Mathewson <nickm@torproject.org>

Sun, 22 Dec 2013 04:15:41 +0000 (23:15 -0500)

committer Nick Mathewson <nickm@torproject.org>

Sun, 22 Dec 2013 04:15:41 +0000 (23:15 -0500)
author Nick Mathewson <nickm@torproject.org>
Sun, 22 Dec 2013 04:15:41 +0000 (23:15 -0500)
committer Nick Mathewson <nickm@torproject.org>
Sun, 22 Dec 2013 04:15:41 +0000 (23:15 -0500)
diff --cc event.c
Simple merge
diff --cc include/event2/event.h
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Sun, 22 Dec 2013 04:15:41 +0000 (23:15 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Sun, 22 Dec 2013 04:15:41 +0000 (23:15 -0500)
		1	2
event.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/event2/event.h	patch \|	diff1 \|	diff2 \|	blob \| history