[tor-commits] [manual/master] Merge branch 'fix-issue-59'