Merge branch 'pull-247' into prerelease
commit1062854faa55aa811adb84a1f39d1a30d0f4eb41
authorStephen Lombardo <sjlombardo@zetetic.net>
Thu, 6 Sep 2018 17:10:32 +0000 (6 13:10 -0400)
committerStephen Lombardo <sjlombardo@zetetic.net>
Thu, 6 Sep 2018 17:10:32 +0000 (6 13:10 -0400)
tree7fc8d10af7fae1f1f84670ac4a81dd170e12a39d
parent184305e78ec051aadcd5a06c1f9b9e802d6c6f07
parent87c389ce048d1955482354851b196036e11d26e0
Merge branch 'pull-247' into prerelease
src/crypto_impl.c