[Cryptech-Commits] [sw/libhal] 13/13: Merge branch 'profiling' into hashsig

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

paul at psgd.org pushed a commit to branch hashsig
in repository sw/libhal.

commit 110754870a5db73b064ae065b7927476c880b48a
Merge: 34cf7ef c6543a7
Author: Paul Selkirk <paul at psgd.org>
AuthorDate: Thu Apr 19 19:40:03 2018 -0400

    Merge branch 'profiling' into hashsig

 ecdsa.c        | 1 +
 hal_internal.h | 1 +
 locks.c        | 5 +++++
 pbkdf2.c       | 2 ++
 4 files changed, 9 insertions(+)