Commit 89def5391e3c817f06a7685a0a07cbd33156c108

Nick Mathewson 2011-06-16T13:28:40

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