From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 6 Jan 2014 17:11:30 +0000 (-0500)
Subject: Merge remote-tracking branch 'asweeny86/event-count-max'
X-Git-Tag: release-2.1.4-alpha~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f9e091bf4e37f9fdd7c98cd9a062acf61880df2c;p=libevent

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

f9e091bf4e37f9fdd7c98cd9a062acf61880df2c