From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 6 Jan 2011 17:44:45 +0000 (-0500)
Subject: Merge remote branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~321
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1e9a7e7e442f80b61a2dd6f0c8f1f5ce456b033;p=libevent

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

f1e9a7e7e442f80b61a2dd6f0c8f1f5ce456b033