Commit 6c14d564304d8a557f2e1f06b5e31dc0645ce0ab

Nick Mathewson 2012-07-16T15:44:07

Merge remote-tracking branch 'origin/patches-2.0' Conflicts: event.c win32select.c