Commit 387e6b90c32daa34d0fc7b02833499b755e4ebea

Nick Mathewson 2013-06-10T15:16:13

Merge remote-tracking branch 'public/pr/79' into patches-2.0