Commit 07cb57042d11a386b9616a6c55af5bd0596f68ea

Nick Mathewson 2012-04-03T16:08:23

Oops; fix a merge conflict that got committed into event2/event-config.h. Now msvc builds work again.