Commit 1bc4a8f99d6752c6259c86beec4f2fef34f0d584

Nick Mathewson 2013-03-25T21:14:10

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