3 Commits

Author SHA1 Message Date
Nick Mathewson
9ca7a3a3d6 Resolve two conflicts.
svn:r839
2008-05-30 16:19:01 +00:00
Nick Mathewson
0a804f3c83 r19641@catbus: nickm | 2008-05-07 17:51:26 -0400
Forward-port: Fix win32 vc-2005 build.


svn:r786
2008-05-07 21:51:49 +00:00
Nick Mathewson
4e1ec3e05e Make all the C files in the libraries compile under MSVC 2005 Express. There are still a few warnings, and probably some subtle issues, but it's better than nothing.
svn:r499
2007-11-07 21:01:26 +00:00