Commit 9155b0953467320b7b0c7dba7af98447c1d7d5e8

Nick Mathewson 2011-05-25T16:52:50

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