Commit 942e22681f836562b3a7ab58e72d7e50b20670da

Nick Mathewson 2011-05-27T23:19:11

Merge remote-tracking branch 'origin/patches-2.0' Conflicts: evthread_win32.c listener.c