From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 3 Jul 2011 01:50:49 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~247
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2bbed8fe2ac99069817dc2d76c7762b474c41089;p=libevent

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

2bbed8fe2ac99069817dc2d76c7762b474c41089