Commit e20eabd69a43d40d199de6efbddf3105273df19b

Nick Mathewson 2011-09-12T11:31:19

Merge branch '21_enable_debugging'