[tor-commits] [gettor/develop] Change related to #17211