From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 8 Mar 2011 02:59:47 +0000 (-0500)
Subject: Merge remote branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~305
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c53895944dfefd0f8586d2639d400e0ffe956562;p=libevent

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

c53895944dfefd0f8586d2639d400e0ffe956562