From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 27 Oct 2010 14:27:04 +0000 (-0400)
Subject: Merge remote branch 'trondn/master'
X-Git-Tag: release-2.0.9-rc~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8a903cee8b3bfc56423a58ba313ee1a030ae6f1;p=libevent

Merge remote branch 'trondn/master'
---

e8a903cee8b3bfc56423a58ba313ee1a030ae6f1