Merge branch '21_eventlist_v3_squashed'

diff --cc event-internal.h
Simple merge

diff --cc event.c
Simple merge

diff --cc evmap-internal.h
Simple merge

diff --cc evmap.c
Simple merge

diff --cc include/event2/event.h
Simple merge

diff --cc include/event2/event_struct.h
Simple merge

diff --cc util-internal.h
Simple merge