Commit 14ec20a7a3e1b7871756a9166db7a31f74baca1d

Nick Mathewson 2011-08-11T14:00:01

Merge remote-tracking branch 'ellzey/debug_timer_add_usec'