Commit 0b05aa65916334cd8cec9de21d6d6df7dd7dadeb

Nick Mathewson 2013-06-10T10:47:28

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