Commit 975eacad363aea1781f563b55d6a4e9aaf95f456

Nick Mathewson 2011-02-23T11:25:09

Merge remote branch 'origin/patches-2.0'