Commit 515ed87943794dd379f94f083ccfd450953829b5

Nick Mathewson 2013-10-14T11:22:40

Merge branch 'pr_81'