Commit b07940ced7ff1778590ca61fc6a20144c685dcd4

Nick Mathewson 2011-07-05T14:58:35

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