[tor-commits] [tor] 03/03: Fix duplicate code after tor-gitlab/mr/671 forward merge