From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 1 Aug 2011 14:30:02 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~232
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e918f15a4c97cd275b7b98c5de844879327a86eb;p=libevent

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

e918f15a4c97cd275b7b98c5de844879327a86eb