Commit dcab134708677f3b1f45b201e9d2e3df46de7f30

Nick Mathewson 2012-03-30T10:29:08

Merge remote-tracking branch 'origin/patches-2.0'