[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'arthur/20628+1'