Commit d1a904d0eb1207ad609ee038e077a47d5fcf3435

Nick Mathewson 2012-03-22T13:48:33

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