Commit 18667d3c28da99212d21885b5eb8323e44344e3e

Nick Mathewson 2011-07-18T18:07:48

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