Commit e780d4e16cec42ea6826773fb37f855e84395be8

Nick Mathewson 2012-04-02T18:14:26

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