From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 14 Oct 2013 15:22:40 +0000 (-0400)
Subject: Merge branch 'pr_81'
X-Git-Tag: release-2.1.4-alpha~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=515ed87943794dd379f94f083ccfd450953829b5;p=libevent

Merge branch 'pr_81'
---

515ed87943794dd379f94f083ccfd450953829b5