Commit 8a739b3492ffbda78eee56f386a923ab974a1589

Nick Mathewson 2012-06-28T11:36:52

Merge branch '21_event_callback_v3'