[tbb-commits] [torbutton/master] Merge remote-tracking branches 'richardgl/40057' and 'richardgl/40058'