Commit fe9e831ffb6bc544e55ff33bc44788d37bac592e

Nick Mathewson 2011-11-15T17:22:45

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