Commit d87a3f71c6c3a5efa706f24eb8f40bb2da8ef6dd

Nick Mathewson 2011-08-11T13:59:02

Merge remote-tracking branch 'ellzey/event_debug_flag'