Commit b260065ab6306cdeeb08f426cedbf709332ec82f

Nick Mathewson 2011-08-28T14:06:03

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