From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 27 May 2011 19:09:54 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~267
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=356720a23bfa9b8d5418c07485e0a7cb66487fc6;p=libevent

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

356720a23bfa9b8d5418c07485e0a7cb66487fc6