From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Jan 2018 22:32:53 +0000 (-0800)
Subject: Merge branch 'ab/dc-sha1-loose-ends'
X-Git-Tag: v2.16.0-rc2~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a09a5e6c36d21d1697ab369ef917af7a682a25c5

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
---

a09a5e6c36d21d1697ab369ef917af7a682a25c5