diff options
| author | Werner Koch <[email protected]> | 2018-05-13 11:29:40 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-05-13 11:29:40 +0000 |
| commit | 7b7576637ddfb6e426e77a86b05af6d828e585d5 (patch) | |
| tree | 21919eed435194f8db1dac8150b581a731a66e26 /doc/examples | |
| parent | doc: Include release info from 2.2.6 (diff) | |
| parent | doc: Fix URL in NEWS. (diff) | |
| download | gnupg-7b7576637ddfb6e426e77a86b05af6d828e585d5.tar.gz gnupg-7b7576637ddfb6e426e77a86b05af6d828e585d5.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Resolved Conflicts:
NEWS - removed
configure.ac - removed
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'doc/examples')
| -rw-r--r-- | doc/examples/vsnfd.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/examples/vsnfd.prf b/doc/examples/vsnfd.prf index 061e06982..2884fe71e 100644 --- a/doc/examples/vsnfd.prf +++ b/doc/examples/vsnfd.prf @@ -15,7 +15,7 @@ enable-crl-checks [gpg-agent] enable-extended-key-format default-cache-ttl 900 -max-cache-ttl [] 3600 +max-cache-ttl 3600 no-allow-mark-trusted no-allow-external-cache enforce-passphrase-constraints |