Commit f3bd36728f399848ff5aa02512fc95e63613d991

Nick Mathewson 2012-06-01T09:50:07

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