[tbb-commits] [torbutton/maint-10.5] Merge remote-tracking branch 'richardgl/40051_10.5' into maint-10.5