Commit f9e091bf4e37f9fdd7c98cd9a062acf61880df2c

Nick Mathewson 2014-01-06T12:11:30

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