From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 30 Apr 2013 16:02:19 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.3-alpha~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6561efbce64c3e76a389357f8bde0b10f448f0c;p=libevent

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

c6561efbce64c3e76a389357f8bde0b10f448f0c