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