Commit e465623a9c5ebc4bc85b7011c25d557a24a677d0

Nick Mathewson 2012-02-10T12:05:39

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