Commit cea45590e25ff0e8a07d339b5483869442dffb25

Nick Mathewson 2011-04-24T22:56:16

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