[tbb-commits] [torbutton/maint-10.0] Merge remote-tracking branch 'acatgl/40019' into maint-10.0