Merge branch 'SpexGuy-fix-comptime-cityhash'

I commented out the comptime test though since it was causing OOM on the
CI server.

closes #7331
5cc2e500e6Andrew Kelley committed on 1/11/2021, 8:58:31 PMparents73b17470c8e2c9
1 file changedLine totals unavailable