From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 4 Apr 2011 19:09:47 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~298
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ddcca1760f7ef0fc9c4abf09a2af8aff6dec702e;p=libevent

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

ddcca1760f7ef0fc9c4abf09a2af8aff6dec702e