Commit 1ff2c249bd834a0b2f7de69ed88b61b036bbbf7e

Nick Mathewson 2012-10-24T22:48:59

Merge remote-tracking branch 'public/20_bev_timeout_semantics' into patches-2.0