[master] 33dfb498b Merge branch '6.6'

[Martin Blix Grydeland]

commit 33dfb498b6c8f43ce8c9321867a3203e8ad0992c
Merge: b90b293d0 ef54768fc
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Mon Mar 15 12:49:16 2021 +0100

    Merge branch '6.6'

diff --cc configure.ac
index 0201b72ec,0b4c32d2d..59aa57b9e
--- a/configure.ac
+++ b/configure.ac
@@@ -1,8 -1,8 +1,8 @@@
  AC_PREREQ(2.59)
  AC_COPYRIGHT([Copyright (c) 2006 Verdens Gang AS
- Copyright (c) 2006-2020 Varnish Software])
+ Copyright (c) 2006-2021 Varnish Software])
  AC_REVISION([$Id$])
 -AC_INIT([Varnish], [6.6.0], [varnish-dev at varnish-cache.org])
 +AC_INIT([Varnish], [trunk], [varnish-dev at varnish-cache.org])
  AC_CONFIG_SRCDIR(include/miniobj.h)
  AC_CONFIG_HEADERS([config.h])
  AC_CONFIG_MACRO_DIR([m4])