From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 22 Jan 2014 16:46:52 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.4-alpha~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99cd818741c9f15e0c9ba1c4bbc8ff12b5e71d7b;p=libevent

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

99cd818741c9f15e0c9ba1c4bbc8ff12b5e71d7b