Commit 71349d080b4aa0138ff6c0e5f9fb1135b9c7f135

Nick Mathewson 2011-07-05T00:35:35

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