[taler-anastasis] 02/03: merge

[gnunet]

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

dennis-neufeld pushed a commit to branch master
in repository anastasis.

commit 363dbf3eecee4202f2cec5b91f0fc07790a4ecbf
Merge: fc8f736 28825d7
Author: Dennis Neufeld <address@hidden>
AuthorDate: Mon Mar 30 06:15:19 2020 +0000

    merge

 src/include/Makefile.am     |   3 +-
 src/include/anastasis.h     | 411 +++++++++++++++++++++++++++++++++++++-------
 src/lib/Makefile.am         |   1 -
 src/lib/anastasis.c         | 261 +++++++++++++++++++++++++++-
 src/util/anastasis_crypto.c |  38 ++--
 5 files changed, 624 insertions(+), 90 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
address@hidden.