Merge remote-tracking branch 'origin/master' into identity_abe
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Sat, 2 Dec 2017 21:34:21 +0000 (22:34 +0100)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Sat, 2 Dec 2017 21:34:21 +0000 (22:34 +0100)
commitb16fa2d88aabb18f222b40136d6ace68ffc104c6
tree6d46f086f018b6e6c169a8d8312b5990c33c3561
parenta9a7ac802811e76e33b54040bf31f00ea9438cea
parent862e488e08ca71db56dedd59059c5bb1a8c130a5
Merge remote-tracking branch 'origin/master' into identity_abe
configure.ac
src/include/gnunet_crypto_lib.h