Commit d5a3fe5f3eed914f1f1e750e39bca7bd8894f495

Nick Mathewson 2012-01-09T12:00:04

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