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

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

9e486ede076d2139b1c655411ce9560d9baf6984