From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 13 Jan 2011 02:41:58 +0000 (-0500)
Subject: Merge remote branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~319
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b0afe96eb3436bfa286a1fb2059f137458139b7;p=libevent

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

8b0afe96eb3436bfa286a1fb2059f137458139b7