Skip to content
Snippets Groups Projects
Verified Commit fb08513c authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'master' into dos-feb13-6.0 

There were some nontrivial conflicts to resolve, NEWS + the line
    ctx->vld_limit_crypto = KR_VLD_LIMIT_CRYPTO_DEFAULT;
(I had this resolution prepared for a long time.)
parents 4410e100 e20df088
No related branches found
No related tags found
1 merge request!1499Release 6.0.6
Pipeline #122132 waiting for manual action
Stage: build
Stage: sanity
Stage: test
Stage: respdiff
Stage: deploy
Stage: pkg
Pipeline: Knot Resolver

#122133

    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 185 additions and 27 deletions
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment