Commit 2e6a985003cbe10921eef9036c2a7ba5cee5d683

Nick Mathewson 2012-11-01T18:12:07

Merge remote-tracking branch 'github/20_win64_compilation' into 21_win64_compilation Conflicts: event.c http.c sample/event-read-fifo.c test/regress_bufferevent.c