[tor-commits] [community/staging] Merge because master was updated