Who had six toes in the bible?

See 2 Samuel 21:19-20. Some traditional commentaries say that the two verses are both talking about Goliath the Philistine, while others say that verse 20 is talking about one of Goliath's brothers. It is verse 20 which mentions the Philistine who had twenty-four fingers and toes, but does not name him explicitly.