From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 23 Mar 2011 20:34:58 +0000 (-0400)
Subject: Merge remote branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~299
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a91f732beb72af5a7d8c6084e7a59ed5224c189;p=libevent

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

7a91f732beb72af5a7d8c6084e7a59ed5224c189