Commit f324b1dffc443b3c03dda8142177b64306775dca

Nick Mathewson 2013-01-22T17:10:07

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