[tor-commits] [snowflake/master] Merge branch 'ticket21315'