From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 20 Jan 2012 16:40:39 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~137
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=677f23cc22b8356184d012206105433bcd75ae6e;p=libevent

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

677f23cc22b8356184d012206105433bcd75ae6e