From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 23 May 2011 22:25:05 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~275
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=173509d9b679fe536149682e3065485a194d9edb;p=libevent

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

173509d9b679fe536149682e3065485a194d9edb