Commit c3d362858caf2a2162fa8ca8360f9cc39ae49628

Nick Mathewson 2011-07-04T11:48:41

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