Commit 9bf866f5d14b1cdc6f56eccb1dc0ecb9c70f2c21

Nick Mathewson 2012-04-09T19:49:58

Merge remote-tracking branch 'github/21_mach_time'