From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 14 Nov 2011 16:55:37 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~163
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ebc8c80bf99a166e246b39df20aa6f45e062444;p=libevent

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

2ebc8c80bf99a166e246b39df20aa6f45e062444