[tor-commits] [tpo/staging] Merge remote-tracking branch 'anto-gl/master' into staging