Commit 4ab2a89dc73202f90a266979fadbb154df7dcd65

Nick Mathewson 2011-03-12T12:12:35

Merge remote branch 'origin/patches-2.0'