[tor-commits] [tpo/develop] Merge branch 'sponsor-update' into develop