Commit 22845886c6561c26b9aa29cfc01859946d39d811

Nick Mathewson 2011-01-31T16:45:23

Merge remote branch 'origin/patches-2.0'