From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 1 Feb 2011 07:12:46 +0000 (-0500)
Subject: Merge remote branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~315
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86f02d75335ab0b6238865fcbabc414273efbb7c;p=libevent

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

86f02d75335ab0b6238865fcbabc414273efbb7c