Commit 4f20eeaa0966f01485be21df3a6529edc20451e9

Nick Mathewson 2010-10-26T21:32:53

Merge remote branch 'github/20_chain_realign'