Merge branch 'ab/dc-sha1-loose-ends'

Tying loose ends for the recent integration work of collision-detecting SHA-1 implementation. * ab/dc-sha1-loose-ends: Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1

Junio C Hamano committed Jan 9, 2018 at 14:32 UTC a09a5e6c36d21d1697ab369ef917af7a682a25c5

No changes.