commit eea69b7020dbd1bfa172f3660be2e5644fd9687f Merge: ae58303 cd80f6e Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 17 15:54:51 2013 -0500

Merge branch '024_msvc_more'

changes/msvc | 2 ++ src/common/Makefile.nmake | 6 +++++- src/or/Makefile.nmake | 3 +++ src/or/onion.h | 4 ++-- src/win32/orconfig.h | 3 +++ 5 files changed, 15 insertions(+), 3 deletions(-)