[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/272'