From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 26 Oct 2012 23:37:00 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.2-alpha~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32ed11024a7209ecf33ee1387fdf0b112c3278b0;p=libevent

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

32ed11024a7209ecf33ee1387fdf0b112c3278b0