[tor-commits] [tor/main] Merge remote-tracking branches 'tor-gitlab/mr/439' and 'tor-gitlab/mr/441'