Commit e9cccce6e12bfe177ee4c75b685f9fed87606069

Nick Mathewson 2011-08-29T17:51:45

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