From: Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Date: Sat, 2 Dec 2017 21:34:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into identity_abe
X-Git-Tag: gnunet-0.11.0rc0~24^2~11
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b16fa2d88aabb18f222b40136d6ace68ffc104c6;p=oweals%2Fgnunet.git

Merge remote-tracking branch 'origin/master' into identity_abe
---

b16fa2d88aabb18f222b40136d6ace68ffc104c6