Commit 63d37bdd3eae4bec18a088ff09d06a6cd5f15da7

Nick Mathewson 2011-05-20T23:24:43

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