From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 17 Jan 2013 20:54:51 +0000 (-0500)
Subject: Merge branch '024_msvc_more'
X-Git-Tag: tor-0.2.4.10-alpha~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eea69b7020dbd1bfa172f3660be2e5644fd9687f;p=thirdparty%2Ftor.git

Merge branch '024_msvc_more'
---

eea69b7020dbd1bfa172f3660be2e5644fd9687f