Commit 74bf57a63ed5ae48d903b11235803984cefd6962

Nick Mathewson 2011-03-03T12:58:06

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