Commit 0e95950e605d24cff370d07db1a4fc40d15c31e3

Nick Mathewson 2011-05-25T19:46:14

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