Merge remote-tracking branch 'asweeny86/event-count-max'

diff --cc event.c
Simple merge

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

diff --cc test/regress.c
Simple merge