From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 23 Feb 2011 16:25:09 +0000 (-0500)
Subject: Merge remote branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~308
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=975eacad363aea1781f563b55d6a4e9aaf95f456;p=libevent

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

975eacad363aea1781f563b55d6a4e9aaf95f456