From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 2 Jan 2011 05:59:20 +0000 (-0500)
Subject: Merge remote branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~322
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac6904241be9bf56e1de7d6e1f780134359dbd2e;p=libevent

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

ac6904241be9bf56e1de7d6e1f780134359dbd2e