[tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/328'