Commit c307a250d4094aa5d82065bdf52fc1ec311aa072

Nick Mathewson 2013-05-29T13:32:47

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