From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 3 Feb 2011 19:04:25 +0000 (-0500)
Subject: Merge remote branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~314
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4cb3f53a6bb26376e547ad14bf4fb17c7731a309;p=libevent

Merge remote branch 'origin/patches-2.0'
---

4cb3f53a6bb26376e547ad14bf4fb17c7731a309