From: Ondřej Surý <ondrej@isc.org>
Date: Tue, 3 Sep 2019 12:52:13 +0000 (-0400)
Subject: Merge branch '1196-misaligned-address-in-siphash-c-fix' into 'master'
X-Git-Tag: v9.15.4~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=582ba39bb6365092043c6074e715c2b7729abb68;p=thirdparty%2Fbind9.git

Merge branch '1196-misaligned-address-in-siphash-c-fix' into 'master'

lib/isc/siphash.c: Get rid of duplicate block caused by bad rebase

Closes #1196

See merge request isc-projects/bind9!2295
---

582ba39bb6365092043c6074e715c2b7729abb68