Commit 6fdbf3a2bcf4d56238a2792361345b9f90449adc

Nick Mathewson 2012-07-25T16:06:51

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