Commit 87c0dff6aa31e77c048c89bed36e4edccb41cff2

Nick Mathewson 2011-05-30T12:06:36

Merge branch '20_select_nfds' into patches-2.0