Merge branch 'STABLE-BRANCH-2-2' into master
authorWerner Koch <wk@gnupg.org>
Tue, 10 Apr 2018 08:14:30 +0000 (10:14 +0200)
committerWerner Koch <wk@gnupg.org>
Tue, 10 Apr 2018 08:14:30 +0000 (10:14 +0200)
commit36373798c0955241288fb4aec103830106dd7e1f
treefe0ed178d1aeda3847c9c8133a2ed8488a84644a
parentd4dc4245bf0221d2db4118718fc2528ecf43b97b
parent9f69dbeb902ac447adbc92937cd451c4e909f234
Merge branch 'STABLE-BRANCH-2-2' into master

--
Fixed conflicts:
  NEWS            - keep master
  configure.ac    - merge
  g10/card-util.c - mostly 2.2
  g10/sig-check.c - 2.2
15 files changed:
agent/call-scd.c
agent/command-ssh.c
configure.ac
doc/gpg.texi
g10/card-util.c
g10/getkey.c
g10/gpg.c
g10/keydb.h
g10/keyedit.c
g10/keygen.c
g10/main.h
g10/sig-check.c
scd/app-openpgp.c
sm/gpgsm.c
tests/openpgp/defs.scm