From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 31 Jan 2011 21:45:23 +0000 (-0500)
Subject: Merge remote branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~316
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22845886c6561c26b9aa29cfc01859946d39d811;p=libevent

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

22845886c6561c26b9aa29cfc01859946d39d811