From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 22 Jan 2014 16:55:26 +0000 (-0500)
Subject: Merge remote-tracking branch 'joakimsoderberg/win32_fixes'
X-Git-Tag: release-2.1.4-alpha~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee0185e534691da7e265035a4dfd8915a0ddfc26;p=libevent

Merge remote-tracking branch 'joakimsoderberg/win32_fixes'
---

ee0185e534691da7e265035a4dfd8915a0ddfc26