From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 3 Aug 2011 16:12:47 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~230
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=909c40e5d1888a3b6898a3777080a8c06dc20e53;p=libevent

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

909c40e5d1888a3b6898a3777080a8c06dc20e53