Commit 77a4d7f406be9d78876ba8a1b7c7d834d8998479

Nick Mathewson 2011-07-18T23:38:23

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