Commit 0a396a02ba4aafe908d48aeac218bb22a6c364f4

Nick Mathewson 2012-11-16T10:13:15

Merge branch '21_event_cleanup_v3'