[tor-commits] [torspec/main] Merge branch 'tor-gitlab/mr/38'