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

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

78fb99ceb265d5969e06f55b9b9f78d1593ebb7b