Commit 7889c43ef8d719942decaa314a4d335e37911b4a

Nick Mathewson 2011-05-04T16:23:02

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