Commit 93369ff4e9022b4a05e83608f2a9d61a23452ce3

Nick Mathewson 2013-12-21T23:15:41

Merge remote-tracking branch 'ghazel/event_base_active_by_fd'