Commit aaa80ed4914c783e6b76f74e0de6f6bee48d2263

Nick Mathewson 2011-04-27T20:17:34

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