From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 1 Jun 2011 18:02:56 +0000 (-0400)
Subject: Merge remote-tracking branch 'github/master'
X-Git-Tag: release-2.1.1-alpha~260
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25fe382981ef419186b3e09178d4aea7ee5e8753;p=libevent

Merge remote-tracking branch 'github/master'
---

25fe382981ef419186b3e09178d4aea7ee5e8753