Commit ef820dbfb376a2cc4797fcd80d1f6d4a11d1f48c

Nick Mathewson 2013-05-07T10:03:28

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