Commit 614b9bd1f30557653bd41a8874e649b828d9553a

Nick Mathewson 2011-04-26T23:48:31

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