Commit c6561efbce64c3e76a389357f8bde0b10f448f0c

Nick Mathewson 2013-04-30T12:02:19

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