Commit e08a88d7024903acf5ad387a0246c3879f1e499e

Nick Mathewson 2012-04-01T01:01:50

Merge branch '21_http_test_timing'