From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 9 Feb 2011 03:24:51 +0000 (-0500)
Subject: Merge remote branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~313
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f5bf6639625f66055c1858551dd6d2208809ce6;p=libevent

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

9f5bf6639625f66055c1858551dd6d2208809ce6