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

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

a86a0c0463fabbb3ebca65fae789f2e90b314c34