Commit ee412cffe019ea70d5723087eaa84c3c501e5fd6

Nick Mathewson 2012-03-22T14:34:59

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