[tor-commits] [torspec/master] Merge branch 'tor-github/pr/40'