Commit 34631be00c3d2d0e831708cc0e1f08dc92583961

Nick Mathewson 2011-04-21T17:36:30

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