Commit 0ac2ed655aa99d4927fd1f9d740d789cfb380ad0

Nick Mathewson 2013-05-28T11:30:14

Merge remote-tracking branch 'origin/pr/62'