Commit 24e2480520d88c09d36df1cebfd335588b59a3e0

Nick Mathewson 2011-08-08T16:17:18

Merge remote-tracking branch 'github/21_faster_timeout_adj'