Commit e0cae789ca3a13e0bddc26628429feb80bff4b32

Nick Mathewson 2011-10-05T11:26:52

Merge branch '21_evloop_noexit'