Merge branch 'STABLE-BRANCH-2-2' into master
authorWerner Koch <wk@gnupg.org>
Mon, 11 Dec 2017 09:42:38 +0000 (10:42 +0100)
committerWerner Koch <wk@gnupg.org>
Mon, 11 Dec 2017 09:42:38 +0000 (10:42 +0100)
commitb38ca59bdb0b9173aca620210afc8b52a6882e85
tree32db72710c66a1d6e6a5b9e09ab4ac05360cb8a5
parent34defc9bce91d66fa8c9481ebe6e78b612e570dc
parent3e72143023aa8a01d3e648797df89ae106e24e88
Merge branch 'STABLE-BRANCH-2-2' into master
agent/protect.c