Commit d7451b0523478ee0b2b52aee8f13c433f80faa8d

Nick Mathewson 2011-08-15T11:14:57

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