[tor-commits] [tor] 03/03: Merge remote-tracking branch 'tor-gitlab/mr/598'