Commit 3555befd1c0b624ea602d02e81563978c129079c

Nick Mathewson 2013-04-26T12:27:05

Merge branch '21_deadlock_fix_v2'