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)
1  2 
agent/protect.c

diff --cc agent/protect.c
Simple merge