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

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

3ec46c0c3451ba05b4c3391797d00ff33cd19ac9