diff --git a/APIs.txt b/APIs.txt
index 9ba465278..8186f88ef 100644
--- a/APIs.txt
+++ b/APIs.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE.
+# Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE.
 LSQUIC APIs
 ===========
 
diff --git a/CHANGELOG b/CHANGELOG
index 7c95b3f34..aa6e4617b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+2021-01-06
+    - 2.27.1
+    - [API] New knob to set outgoing packet batch size.
+    - Aborted connection now become tickable immediately.
+    - Abort connection when HTTP/3 frame cannot be opened (can only happen
+      when malloc fails).
+
 2020-12-31
     - 2.27.0
     - [API] Remove keylog callbacks.  See issue #188.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23cb54010..1713c92aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE.
+# Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE.
 cmake_minimum_required(VERSION 2.8)
 
 
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 01b3e9fe7..4b41a2e70 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE.
+# Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE.
 In addition to the LiteSpeed QUIC Team, the following people contributed
 to the LiteSpeed QUIC and HTTP/3 Library:
 
diff --git a/EXAMPLES.txt b/EXAMPLES.txt
index d1b258415..58887d41f 100644
--- a/EXAMPLES.txt
+++ b/EXAMPLES.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE.
+# Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE.
 LSQUIC Examples
 ===============
 
diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index 01c248c67..aa1a984e3 100644
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE.
+# Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE.
 INCLUDE(CheckFunctionExists)
 CHECK_FUNCTION_EXISTS(sendmmsg HAVE_SENDMMSG)
 CHECK_FUNCTION_EXISTS(recvmmsg HAVE_RECVMMSG)
diff --git a/bin/duck_client.c b/bin/duck_client.c
index c71d72eb8..307c74870 100644
--- a/bin/duck_client.c
+++ b/bin/duck_client.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * duck_client.c -- The siduck client.  See
  *      https://tools.ietf.org/html/draft-pardue-quic-siduck-00
diff --git a/bin/duck_server.c b/bin/duck_server.c
index ffa2c2515..fae70a1b3 100644
--- a/bin/duck_server.c
+++ b/bin/duck_server.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * A duck quacks!  The server for the siduck protocol:
  *      https://tools.ietf.org/html/draft-pardue-quic-siduck-00
diff --git a/bin/echo_client.c b/bin/echo_client.c
index 28f1b3454..896f0ae6b 100644
--- a/bin/echo_client.c
+++ b/bin/echo_client.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * echo_client.c -- This is really a "line client:" it connects to QUIC server
  * and sends it stuff, line by line.  It works in tandem with echo_server.
diff --git a/bin/echo_server.c b/bin/echo_server.c
index 7e1c5d67e..3750d84d6 100644
--- a/bin/echo_server.c
+++ b/bin/echo_server.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * echo_server.c -- QUIC server that echoes back input line by line
  */
diff --git a/bin/http_client.c b/bin/http_client.c
index 0320a01e4..9b0fa4d56 100644
--- a/bin/http_client.c
+++ b/bin/http_client.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * http_client.c -- A simple HTTP/QUIC client
  */
diff --git a/bin/http_server.c b/bin/http_server.c
index a5bb8d52f..81ce97d44 100644
--- a/bin/http_server.c
+++ b/bin/http_server.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * http_server.c -- A simple HTTP/QUIC server
  *
diff --git a/bin/md5_client.c b/bin/md5_client.c
index a7161191e..f0360b8d0 100644
--- a/bin/md5_client.c
+++ b/bin/md5_client.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * md5_client.c -- This client sends one or more files to MD5 QUIC server
  *                 for MD5 sum calculation.
diff --git a/bin/md5_server.c b/bin/md5_server.c
index 44d0603c0..b36768eb9 100644
--- a/bin/md5_server.c
+++ b/bin/md5_server.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * md5_server.c -- Read one or more streams from the client and return
  *                 MD5 sum of the payload.
diff --git a/bin/prog.c b/bin/prog.c
index ab8ab63d7..f1cee0507 100644
--- a/bin/prog.c
+++ b/bin/prog.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #ifndef WIN32
 #include <arpa/inet.h>
diff --git a/bin/prog.h b/bin/prog.h
index 572b56a8a..804d05422 100644
--- a/bin/prog.h
+++ b/bin/prog.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * prog.h -- common setup and options for QUIC program
  */
diff --git a/bin/test_cert.c b/bin/test_cert.c
index 9c9f1d262..af1f8d0ed 100644
--- a/bin/test_cert.c
+++ b/bin/test_cert.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/bin/test_cert.h b/bin/test_cert.h
index 60898a5f3..25ed43bdb 100644
--- a/bin/test_cert.h
+++ b/bin/test_cert.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef TEST_CERT_H
 #define TEST_CERT_H
 
diff --git a/bin/test_common.c b/bin/test_common.c
index 6a933cb84..456523ff3 100644
--- a/bin/test_common.c
+++ b/bin/test_common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #if __GNUC__
 #define _GNU_SOURCE     /* For struct in6_pktinfo */
 #endif
@@ -1953,6 +1953,11 @@ set_engine_option (struct lsquic_engine_settings *settings,
             settings->es_ptpc_prop_gain = atof(val);
             return 0;
         }
+        if (0 == strncmp(name, "max_batch_size", 14))
+        {
+            settings->es_max_batch_size = atoi(val);
+            return 0;
+        }
         break;
     case 15:
         if (0 == strncmp(name, "allow_migration", 15))
diff --git a/bin/test_common.h b/bin/test_common.h
index 38441ad57..5bb291af3 100644
--- a/bin/test_common.h
+++ b/bin/test_common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * Test client's and server's common components.
  */
diff --git a/docs/apiref.rst b/docs/apiref.rst
index 622fcc4ae..8059a8ceb 100644
--- a/docs/apiref.rst
+++ b/docs/apiref.rst
@@ -866,6 +866,14 @@ settings structure:
 
        Default value is :macro:`LSQUIC_DF_DELAY_ONCLOSE`
 
+    .. member:: int             es_max_batch_size
+
+       If set to a non-zero value, specifies maximum batch size.  (The
+       batch of packets passed to :member:`lsquic_engine_api.ea_packets_out`).
+       Must be no larger than 1024.
+
+       Default value is :macro:`LSQUIC_DF_MAX_BATCH_SIZE`
+
 To initialize the settings structure to library defaults, use the following
 convenience function:
 
@@ -1102,6 +1110,11 @@ out of date.  Please check your :file:`lsquic.h` for actual values.*
 
     By default, calling :member:`lsquic_stream_if.on_close()` is not delayed.
 
+.. macro:: LSQUIC_DF_MAX_BATCH_SIZE
+
+    By default, maximum batch size is not specified, leaving it up to the
+    library.
+
 Receiving Packets
 -----------------
 
@@ -1426,6 +1439,12 @@ Closing Connections
     This closes the connection.  :member:`lsquic_stream_if.on_conn_closed`
     and :member:`lsquic_stream_if.on_close` callbacks will be called.
 
+.. function:: void lsquic_conn_abort (lsquic_conn_t *conn)
+
+    This aborts the connection.  The connection and all associated objects
+    will be destroyed (with necessary callbacks called) during the next time
+    :func:`lsquic_engine_process_conns()` is invoked.
+
 Creating Streams
 ----------------
 
diff --git a/docs/conf.py b/docs/conf.py
index dbe635dc6..dfbfe38c2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -26,7 +26,7 @@
 # The short X.Y version
 version = u'2.27'
 # The full version, including alpha/beta/rc tags
-release = u'2.27.0'
+release = u'2.27.1'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/include/lsquic.h b/include/lsquic.h
index 48ba656b1..298ea4ba2 100644
--- a/include/lsquic.h
+++ b/include/lsquic.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef __LSQUIC_H__
 #define __LSQUIC_H__
 
@@ -25,7 +25,7 @@ extern "C" {
 
 #define LSQUIC_MAJOR_VERSION 2
 #define LSQUIC_MINOR_VERSION 27
-#define LSQUIC_PATCH_VERSION 0
+#define LSQUIC_PATCH_VERSION 1
 
 /**
  * Engine flags:
@@ -434,6 +434,12 @@ typedef struct ssl_ctx_st * (*lsquic_lookup_cert_f)(
 /** By default, calling on_close() is not delayed */
 #define LSQUIC_DF_DELAY_ONCLOSE 0
 
+/**
+ * By default, maximum batch size is not specified, leaving it up to the
+ * library.
+ */
+#define LSQUIC_DF_MAX_BATCH_SIZE 0
+
 struct lsquic_engine_settings {
     /**
      * This is a bit mask wherein each bit corresponds to a value in
@@ -1038,6 +1044,15 @@ struct lsquic_engine_settings {
      * Default value is @ref LSQUIC_DF_DELAY_ONCLOSE
      */
     int             es_delay_onclose;
+
+    /**
+     * If set to a non-zero value, specifies maximum batch size.  (The
+     * batch of packets passed to @ref ea_packets_out() callback).  Must
+     * be no larger than 1024.
+     *
+     * Default value is @ref LSQUIC_DF_MAX_BATCH_SIZE
+     */
+    unsigned        es_max_batch_size;
 };
 
 /* Initialize `settings' to default values */
diff --git a/include/lsquic_types.h b/include/lsquic_types.h
index 23220351b..92d752ba8 100644
--- a/include/lsquic_types.h
+++ b/include/lsquic_types.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef __LSQUIC_TYPES_H__
 #define __LSQUIC_TYPES_H__
 
diff --git a/include/lsxpack_header.h b/include/lsxpack_header.h
index ac53c50d2..e4719934b 100644
--- a/include/lsxpack_header.h
+++ b/include/lsxpack_header.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSXPACK_HEADER_H_v206
 #define LSXPACK_HEADER_H_v206
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2f7174bae..66276a098 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE.
+# Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE.
 cmake_minimum_required(VERSION 2.8)
 
 add_subdirectory(liblsquic)
diff --git a/src/liblsquic/CMakeLists.txt b/src/liblsquic/CMakeLists.txt
index ffc2b1dab..9ed488c31 100644
--- a/src/liblsquic/CMakeLists.txt
+++ b/src/liblsquic/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE.
+# Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE.
 SET(lsquic_STAT_SRCS
     ls-qpack/lsqpack.c
     lsquic_adaptive_cc.c
diff --git a/src/liblsquic/common_cert_set_2.c b/src/liblsquic/common_cert_set_2.c
index 36b2d60ae..4e41de0f0 100644
--- a/src/liblsquic/common_cert_set_2.c
+++ b/src/liblsquic/common_cert_set_2.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* Copyright (c) 2015 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE.chrome file.
diff --git a/src/liblsquic/common_cert_set_2a.inc b/src/liblsquic/common_cert_set_2a.inc
index d951bf36f..403417aeb 100644
--- a/src/liblsquic/common_cert_set_2a.inc
+++ b/src/liblsquic/common_cert_set_2a.inc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* Copyright (c) 2015 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE.chrome file.
diff --git a/src/liblsquic/common_cert_set_2b.inc b/src/liblsquic/common_cert_set_2b.inc
index 811122061..586af45b4 100644
--- a/src/liblsquic/common_cert_set_2b.inc
+++ b/src/liblsquic/common_cert_set_2b.inc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* Copyright (c) 2015 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE.chrome file.
diff --git a/src/liblsquic/common_cert_set_3.c b/src/liblsquic/common_cert_set_3.c
index 6c0d72da1..1e6d40197 100644
--- a/src/liblsquic/common_cert_set_3.c
+++ b/src/liblsquic/common_cert_set_3.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* Copyright (c) 2015 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE.chrome file.
diff --git a/src/liblsquic/common_cert_set_3a.inc b/src/liblsquic/common_cert_set_3a.inc
index 9f02f2949..de6677703 100644
--- a/src/liblsquic/common_cert_set_3a.inc
+++ b/src/liblsquic/common_cert_set_3a.inc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* Copyright (c) 2015 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE.chrome file.
diff --git a/src/liblsquic/common_cert_set_3b.inc b/src/liblsquic/common_cert_set_3b.inc
index 1ed258f1a..5f080b753 100644
--- a/src/liblsquic/common_cert_set_3b.inc
+++ b/src/liblsquic/common_cert_set_3b.inc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* Copyright (c) 2015 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE.chrome file.
diff --git a/src/liblsquic/fiu-local.h b/src/liblsquic/fiu-local.h
index c69847c13..7c295ebea 100644
--- a/src/liblsquic/fiu-local.h
+++ b/src/liblsquic/fiu-local.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 
 /* libfiu - Fault Injection in Userspace
  *
diff --git a/src/liblsquic/ls-sfparser.c b/src/liblsquic/ls-sfparser.c
index 1c1d4316d..03bcc4647 100644
--- a/src/liblsquic/ls-sfparser.c
+++ b/src/liblsquic/ls-sfparser.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #line 2 "ls-sfparser.c"
 #line 2 "ls-sfparser.l"
 /*
diff --git a/src/liblsquic/ls-sfparser.h b/src/liblsquic/ls-sfparser.h
index d423d98e9..152ba6881 100644
--- a/src/liblsquic/ls-sfparser.h
+++ b/src/liblsquic/ls-sfparser.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
 MIT License
 
diff --git a/src/liblsquic/lsquic_adaptive_cc.c b/src/liblsquic/lsquic_adaptive_cc.c
index 8f6caa5a5..a789476a7 100644
--- a/src/liblsquic/lsquic_adaptive_cc.c
+++ b/src/liblsquic/lsquic_adaptive_cc.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* lsquic_adaptive_cc.c -- adaptive congestion controller */
 
 #include <inttypes.h>
diff --git a/src/liblsquic/lsquic_adaptive_cc.h b/src/liblsquic/lsquic_adaptive_cc.h
index 64a298a34..105ca4276 100644
--- a/src/liblsquic/lsquic_adaptive_cc.h
+++ b/src/liblsquic/lsquic_adaptive_cc.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_adaptive_cc.h -- Adaptive congestion controller
  *
diff --git a/src/liblsquic/lsquic_alarmset.c b/src/liblsquic/lsquic_alarmset.c
index f9ff17bb5..8879f989b 100644
--- a/src/liblsquic/lsquic_alarmset.c
+++ b/src/liblsquic/lsquic_alarmset.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_alarmset.c -- A set of alarms
  */
diff --git a/src/liblsquic/lsquic_alarmset.h b/src/liblsquic/lsquic_alarmset.h
index 0c854cfe6..6c1d4c1ac 100644
--- a/src/liblsquic/lsquic_alarmset.h
+++ b/src/liblsquic/lsquic_alarmset.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_alarmset.h -- A set of alarms
  */
diff --git a/src/liblsquic/lsquic_arr.c b/src/liblsquic/lsquic_arr.c
index 221fa430d..f28c743f6 100644
--- a/src/liblsquic/lsquic_arr.c
+++ b/src/liblsquic/lsquic_arr.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_arr.c
  */
diff --git a/src/liblsquic/lsquic_arr.h b/src/liblsquic/lsquic_arr.h
index 8830f13df..994eacf1e 100644
--- a/src/liblsquic/lsquic_arr.h
+++ b/src/liblsquic/lsquic_arr.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_arr.h -- Array
  */
diff --git a/src/liblsquic/lsquic_attq.c b/src/liblsquic/lsquic_attq.c
index c0210d091..e00cb197b 100644
--- a/src/liblsquic/lsquic_attq.c
+++ b/src/liblsquic/lsquic_attq.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_attq.c -- Advisory Tick Time Queue
  *
diff --git a/src/liblsquic/lsquic_attq.h b/src/liblsquic/lsquic_attq.h
index f6961227d..bcc3a222d 100644
--- a/src/liblsquic/lsquic_attq.h
+++ b/src/liblsquic/lsquic_attq.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_attq.h -- Advisory Tick Time Queue
  */
diff --git a/src/liblsquic/lsquic_bbr.c b/src/liblsquic/lsquic_bbr.c
index edd72461b..3610eec5c 100644
--- a/src/liblsquic/lsquic_bbr.c
+++ b/src/liblsquic/lsquic_bbr.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE.chrome file.
diff --git a/src/liblsquic/lsquic_bbr.h b/src/liblsquic/lsquic_bbr.h
index d83306a40..699080903 100644
--- a/src/liblsquic/lsquic_bbr.h
+++ b/src/liblsquic/lsquic_bbr.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_BBR_H
 #define LSQUIC_BBR_H
 
diff --git a/src/liblsquic/lsquic_bw_sampler.c b/src/liblsquic/lsquic_bw_sampler.c
index 93596a35b..3bf7be8b2 100644
--- a/src/liblsquic/lsquic_bw_sampler.c
+++ b/src/liblsquic/lsquic_bw_sampler.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <inttypes.h>
 #include <stddef.h>
diff --git a/src/liblsquic/lsquic_bw_sampler.h b/src/liblsquic/lsquic_bw_sampler.h
index cb117d89f..51ca3bfe0 100644
--- a/src/liblsquic/lsquic_bw_sampler.h
+++ b/src/liblsquic/lsquic_bw_sampler.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_BW_SAMPLER_H
 #define LSQUIC_BW_SAMPLER_H 1
 
diff --git a/src/liblsquic/lsquic_byteswap.h b/src/liblsquic/lsquic_byteswap.h
index 126bc0057..bf23ace29 100644
--- a/src/liblsquic/lsquic_byteswap.h
+++ b/src/liblsquic/lsquic_byteswap.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_BYTESWAP_H
 #define LSQUIC_BYTESWAP_H 1
 
diff --git a/src/liblsquic/lsquic_cfcw.c b/src/liblsquic/lsquic_cfcw.c
index 6f18fac72..c51067c68 100644
--- a/src/liblsquic/lsquic_cfcw.c
+++ b/src/liblsquic/lsquic_cfcw.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <inttypes.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/liblsquic/lsquic_chsk_stream.c b/src/liblsquic/lsquic_chsk_stream.c
index db1811f60..307a5e696 100644
--- a/src/liblsquic/lsquic_chsk_stream.c
+++ b/src/liblsquic/lsquic_chsk_stream.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * Stream/crypto handshake adapter for the client side.
  *
diff --git a/src/liblsquic/lsquic_chsk_stream.h b/src/liblsquic/lsquic_chsk_stream.h
index 9169d59a3..dada4a149 100644
--- a/src/liblsquic/lsquic_chsk_stream.h
+++ b/src/liblsquic/lsquic_chsk_stream.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * Stream/crypto handshake adapter for the client side.
  */
diff --git a/src/liblsquic/lsquic_cong_ctl.h b/src/liblsquic/lsquic_cong_ctl.h
index b1b454444..bfcc1c7ed 100644
--- a/src/liblsquic/lsquic_cong_ctl.h
+++ b/src/liblsquic/lsquic_cong_ctl.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_cong_ctl.h -- congestion control interface
  */
diff --git a/src/liblsquic/lsquic_conn.c b/src/liblsquic/lsquic_conn.c
index ce375f9d7..fea9421ae 100644
--- a/src/liblsquic/lsquic_conn.c
+++ b/src/liblsquic/lsquic_conn.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <inttypes.h>
 #include <string.h>
diff --git a/src/liblsquic/lsquic_conn.h b/src/liblsquic/lsquic_conn.h
index 61b48dc4d..cd5f24916 100644
--- a/src/liblsquic/lsquic_conn.h
+++ b/src/liblsquic/lsquic_conn.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_conn.h -- Connection interface
  *
diff --git a/src/liblsquic/lsquic_conn_flow.h b/src/liblsquic/lsquic_conn_flow.h
index 4401df341..91b41aee5 100644
--- a/src/liblsquic/lsquic_conn_flow.h
+++ b/src/liblsquic/lsquic_conn_flow.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_conn_flow.h -- Connection flow control-related functions
  */
diff --git a/src/liblsquic/lsquic_conn_public.h b/src/liblsquic/lsquic_conn_public.h
index 6302b75e5..ac732d0a1 100644
--- a/src/liblsquic/lsquic_conn_public.h
+++ b/src/liblsquic/lsquic_conn_public.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_conn_public.h -- Connection's "public interface"
  *
diff --git a/src/liblsquic/lsquic_crand.c b/src/liblsquic/lsquic_crand.c
index a83fad688..58880f080 100644
--- a/src/liblsquic/lsquic_crand.c
+++ b/src/liblsquic/lsquic_crand.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <openssl/rand.h>
 #include <stdint.h>
 
diff --git a/src/liblsquic/lsquic_crand.h b/src/liblsquic/lsquic_crand.h
index a9bd5e00e..2333b571d 100644
--- a/src/liblsquic/lsquic_crand.h
+++ b/src/liblsquic/lsquic_crand.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_crand.h -- cached random bytes
  *
diff --git a/src/liblsquic/lsquic_crt_compress.c b/src/liblsquic/lsquic_crt_compress.c
index f98d0cfb6..42539a20b 100644
--- a/src/liblsquic/lsquic_crt_compress.c
+++ b/src/liblsquic/lsquic_crt_compress.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdbool.h>
 #include <string.h>
diff --git a/src/liblsquic/lsquic_crt_compress.h b/src/liblsquic/lsquic_crt_compress.h
index 6ace8a1e4..f9b708ef0 100644
--- a/src/liblsquic/lsquic_crt_compress.h
+++ b/src/liblsquic/lsquic_crt_compress.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef __LSQUIC_CRT_COMPRESS_H__
 #define __LSQUIC_CRT_COMPRESS_H__
 
diff --git a/src/liblsquic/lsquic_crypto.c b/src/liblsquic/lsquic_crypto.c
index 11daf57dc..b24c76d42 100644
--- a/src/liblsquic/lsquic_crypto.c
+++ b/src/liblsquic/lsquic_crypto.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <string.h>
 
diff --git a/src/liblsquic/lsquic_crypto.h b/src/liblsquic/lsquic_crypto.h
index b7984646c..045580016 100644
--- a/src/liblsquic/lsquic_crypto.h
+++ b/src/liblsquic/lsquic_crypto.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 
 #ifndef __LSQUIC_CRYPTO_H__
 #define __LSQUIC_CRYPTO_H__
diff --git a/src/liblsquic/lsquic_cubic.c b/src/liblsquic/lsquic_cubic.c
index 778c8e7ab..0d2376374 100644
--- a/src/liblsquic/lsquic_cubic.c
+++ b/src/liblsquic/lsquic_cubic.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_cubic.c -- LSQUIC CUBIC implementation.
  */
diff --git a/src/liblsquic/lsquic_cubic.h b/src/liblsquic/lsquic_cubic.h
index c4c617361..9cf030fb5 100644
--- a/src/liblsquic/lsquic_cubic.h
+++ b/src/liblsquic/lsquic_cubic.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_cubic.h -- CUBIC congestion control protocol.
  */
diff --git a/src/liblsquic/lsquic_data_in_if.h b/src/liblsquic/lsquic_data_in_if.h
index 87a4c6aad..6deb8e006 100644
--- a/src/liblsquic/lsquic_data_in_if.h
+++ b/src/liblsquic/lsquic_data_in_if.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_data_in_if.h -- DATA in interface
  */
diff --git a/src/liblsquic/lsquic_di_error.c b/src/liblsquic/lsquic_di_error.c
index 6d66724b4..1bc901852 100644
--- a/src/liblsquic/lsquic_di_error.c
+++ b/src/liblsquic/lsquic_di_error.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_di_error.c -- A placeholder when things go wrong
  *
diff --git a/src/liblsquic/lsquic_di_hash.c b/src/liblsquic/lsquic_di_hash.c
index b1b44ef1b..c889ffd38 100644
--- a/src/liblsquic/lsquic_di_hash.c
+++ b/src/liblsquic/lsquic_di_hash.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_di_hash.c -- Copy incoming data into a hash
  *
diff --git a/src/liblsquic/lsquic_di_nocopy.c b/src/liblsquic/lsquic_di_nocopy.c
index 02ea9393d..0fe8b4bb3 100644
--- a/src/liblsquic/lsquic_di_nocopy.c
+++ b/src/liblsquic/lsquic_di_nocopy.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_di_nocopy.c -- The "no-copy" data in stream.
  *
diff --git a/src/liblsquic/lsquic_enc_sess.h b/src/liblsquic/lsquic_enc_sess.h
index 072fc90ac..7af721a73 100644
--- a/src/liblsquic/lsquic_enc_sess.h
+++ b/src/liblsquic/lsquic_enc_sess.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_ENC_SESS_H
 #define LSQUIC_ENC_SESS_H 1
 
@@ -295,7 +295,7 @@ struct enc_session_funcs_iquic
                            void *(crypto_streams)[4],
                            const struct crypto_stream_if *,
                            const struct lsquic_cid *odcid,
-                           const struct lsquic_cid *iscid );
+                           const struct lsquic_cid *iscid);
 
     void
     (*esfi_shake_stream)(enc_session_t *, struct lsquic_stream *,
diff --git a/src/liblsquic/lsquic_enc_sess_common.c b/src/liblsquic/lsquic_enc_sess_common.c
index 9c576961d..2270b49c3 100644
--- a/src/liblsquic/lsquic_enc_sess_common.c
+++ b/src/liblsquic/lsquic_enc_sess_common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/src/liblsquic/lsquic_enc_sess_ietf.c b/src/liblsquic/lsquic_enc_sess_ietf.c
index dea41ef3f..6dc3c789e 100644
--- a/src/liblsquic/lsquic_enc_sess_ietf.c
+++ b/src/liblsquic/lsquic_enc_sess_ietf.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_enc_sess_ietf.c -- Crypto session for IETF QUIC
  */
@@ -1014,7 +1014,7 @@ iquic_esfi_create_server (struct lsquic_engine_public *enpub,
                     void *(crypto_streams)[4],
                     const struct crypto_stream_if *cryst_if,
                     const struct lsquic_cid *odcid,
-                    const struct lsquic_cid *iscid )
+                    const struct lsquic_cid *iscid)
 {
     struct enc_sess_iquic *enc_sess;
 
diff --git a/src/liblsquic/lsquic_eng_hist.c b/src/liblsquic/lsquic_eng_hist.c
index fdb693e16..783bd9fd0 100644
--- a/src/liblsquic/lsquic_eng_hist.c
+++ b/src/liblsquic/lsquic_eng_hist.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <time.h>
 #ifdef WIN32
 #include <vc_compat.h>
diff --git a/src/liblsquic/lsquic_eng_hist.h b/src/liblsquic/lsquic_eng_hist.h
index ee45f3898..4bd6ddbbc 100644
--- a/src/liblsquic/lsquic_eng_hist.h
+++ b/src/liblsquic/lsquic_eng_hist.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_eng_hist.h - Engine history.
  *
diff --git a/src/liblsquic/lsquic_engine.c b/src/liblsquic/lsquic_engine.c
index d60514c67..d63376727 100644
--- a/src/liblsquic/lsquic_engine.c
+++ b/src/liblsquic/lsquic_engine.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_engine.c - QUIC engine
  */
@@ -101,9 +101,10 @@
 #endif
 
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
 
 /* The batch of outgoing packets grows and shrinks dynamically */
-/* Batch sizes must be powers of two */
+/* Batch sizes do not have to be powers of two */
 #define MAX_OUT_BATCH_SIZE 1024
 #define MIN_OUT_BATCH_SIZE 4
 #define INITIAL_OUT_BATCH_SIZE 32
@@ -247,6 +248,7 @@ struct lsquic_engine
     struct min_heap                    conns_out;
     struct eng_hist                    history;
     unsigned                           batch_size;
+    unsigned                           min_batch_size, max_batch_size;
     struct lsquic_conn                *curr_conn;
     struct pr_queue                   *pr_queue;
     struct attq                       *attq;
@@ -482,6 +484,14 @@ lsquic_engine_check_settings (const struct lsquic_engine_settings *settings,
         return -1;
     }
 
+    if (settings->es_max_batch_size > MAX_OUT_BATCH_SIZE)
+    {
+        if (err_buf)
+            snprintf(err_buf, err_buf_sz, "max batch size is greater than "
+                "the allowed maximum of %u", (unsigned) MAX_OUT_BATCH_SIZE);
+        return -1;
+    }
+
     return 0;
 }
 
@@ -699,7 +709,19 @@ lsquic_engine_new (unsigned flags,
     }
     engine->attq = lsquic_attq_create();
     eng_hist_init(&engine->history);
-    engine->batch_size = INITIAL_OUT_BATCH_SIZE;
+    if (engine->pub.enp_settings.es_max_batch_size)
+    {
+        engine->max_batch_size = engine->pub.enp_settings.es_max_batch_size;
+        engine->min_batch_size = MIN(4, engine->max_batch_size);
+        engine->batch_size = MAX(engine->max_batch_size / 4,
+                                                    engine->min_batch_size);
+    }
+    else
+    {
+        engine->min_batch_size = MIN_OUT_BATCH_SIZE;
+        engine->max_batch_size = MAX_OUT_BATCH_SIZE;
+        engine->batch_size = INITIAL_OUT_BATCH_SIZE;
+    }
     if (engine->pub.enp_settings.es_honor_prst)
     {
         engine->pub.enp_srst_hash = lsquic_hash_create();
@@ -799,14 +821,14 @@ log_packet_checksum (const lsquic_cid_t *cid, const char *direction,
 static void
 grow_batch_size (struct lsquic_engine *engine)
 {
-    engine->batch_size <<= engine->batch_size < MAX_OUT_BATCH_SIZE;
+    engine->batch_size = MIN(engine->batch_size * 2, engine->max_batch_size);
 }
 
 
 static void
 shrink_batch_size (struct lsquic_engine *engine)
 {
-    engine->batch_size >>= engine->batch_size > MIN_OUT_BATCH_SIZE;
+    engine->batch_size = MAX(engine->batch_size / 2, engine->min_batch_size);
 }
 
 
diff --git a/src/liblsquic/lsquic_engine_public.h b/src/liblsquic/lsquic_engine_public.h
index cc1c42a24..337b79dac 100644
--- a/src/liblsquic/lsquic_engine_public.h
+++ b/src/liblsquic/lsquic_engine_public.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_engine_public.h -- Engine's "public interface"
  *
diff --git a/src/liblsquic/lsquic_ev_log.c b/src/liblsquic/lsquic_ev_log.c
index 613345a36..06107cb98 100644
--- a/src/liblsquic/lsquic_ev_log.c
+++ b/src/liblsquic/lsquic_ev_log.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef WIN32
 #include <arpa/inet.h>
 #else
diff --git a/src/liblsquic/lsquic_ev_log.h b/src/liblsquic/lsquic_ev_log.h
index 7ba135054..c32bcd072 100644
--- a/src/liblsquic/lsquic_ev_log.h
+++ b/src/liblsquic/lsquic_ev_log.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_ev_log.h -- Event logger
  */
diff --git a/src/liblsquic/lsquic_frab_list.c b/src/liblsquic/lsquic_frab_list.c
index 08cb34f2b..6da9cf12c 100644
--- a/src/liblsquic/lsquic_frab_list.c
+++ b/src/liblsquic/lsquic_frab_list.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_frab_list.c -- List of buffer for simple reading and writing
  */
diff --git a/src/liblsquic/lsquic_frab_list.h b/src/liblsquic/lsquic_frab_list.h
index ff4bcafa6..2691c5f6f 100644
--- a/src/liblsquic/lsquic_frab_list.h
+++ b/src/liblsquic/lsquic_frab_list.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_frab_list.h -- List of buffer for simple reading and writing
  *
diff --git a/src/liblsquic/lsquic_frame_common.c b/src/liblsquic/lsquic_frame_common.c
index 97607baaa..01ba74ae4 100644
--- a/src/liblsquic/lsquic_frame_common.c
+++ b/src/liblsquic/lsquic_frame_common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <stdint.h>
 
 #include "lsquic_frame_common.h"
diff --git a/src/liblsquic/lsquic_frame_common.h b/src/liblsquic/lsquic_frame_common.h
index 9b2d6df1c..b3d10740a 100644
--- a/src/liblsquic/lsquic_frame_common.h
+++ b/src/liblsquic/lsquic_frame_common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_frame_common.h
  */
diff --git a/src/liblsquic/lsquic_frame_reader.c b/src/liblsquic/lsquic_frame_reader.c
index 11ff7b9ca..3863d89cd 100644
--- a/src/liblsquic/lsquic_frame_reader.c
+++ b/src/liblsquic/lsquic_frame_reader.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_frame_reader.c -- Read HTTP frames from stream
  */
diff --git a/src/liblsquic/lsquic_frame_reader.h b/src/liblsquic/lsquic_frame_reader.h
index 756f9b1aa..0559ab989 100644
--- a/src/liblsquic/lsquic_frame_reader.h
+++ b/src/liblsquic/lsquic_frame_reader.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_frame_reader.h -- Read HTTP frames from stream
  */
diff --git a/src/liblsquic/lsquic_frame_writer.c b/src/liblsquic/lsquic_frame_writer.c
index 68ab0a7d5..7b08798d5 100644
--- a/src/liblsquic/lsquic_frame_writer.c
+++ b/src/liblsquic/lsquic_frame_writer.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_frame_writer.c -- write frames to HEADERS stream.
  *
diff --git a/src/liblsquic/lsquic_frame_writer.h b/src/liblsquic/lsquic_frame_writer.h
index 94b8de7de..d087912be 100644
--- a/src/liblsquic/lsquic_frame_writer.h
+++ b/src/liblsquic/lsquic_frame_writer.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_frame_writer.h -- write frames to HEADERS stream.
  */
diff --git a/src/liblsquic/lsquic_full_conn.c b/src/liblsquic/lsquic_full_conn.c
index acafaab1f..bb7c22bca 100644
--- a/src/liblsquic/lsquic_full_conn.c
+++ b/src/liblsquic/lsquic_full_conn.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_full_conn.c -- A "full" connection object has full functionality
  */
@@ -3768,6 +3768,7 @@ full_conn_ci_abort (struct lsquic_conn *lconn)
     struct full_conn *conn = (struct full_conn *) lconn;
     LSQ_INFO("User aborted connection");
     conn->fc_flags |= FC_ABORTED;
+    lsquic_engine_add_conn_to_tickable(conn->fc_enpub, lconn);
 }
 
 
@@ -4323,6 +4324,13 @@ full_conn_ci_is_tickable (lsquic_conn_t *lconn)
             return 1;
         }
 
+    if (conn->fc_flags & FC_IMMEDIATE_CLOSE_FLAGS)
+    {
+        LSQ_DEBUG("tickable: immediate close flags: 0x%X",
+            (unsigned) (conn->fc_flags & FC_IMMEDIATE_CLOSE_FLAGS));
+        return 1;
+    }
+
     LSQ_DEBUG("not tickable");
     return 0;
 }
diff --git a/src/liblsquic/lsquic_full_conn.h b/src/liblsquic/lsquic_full_conn.h
index c5ee1c538..78cd3d090 100644
--- a/src/liblsquic/lsquic_full_conn.h
+++ b/src/liblsquic/lsquic_full_conn.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_FULL_CONN_H
 #define LSQUIC_FULL_CONN_H
 
diff --git a/src/liblsquic/lsquic_full_conn_ietf.c b/src/liblsquic/lsquic_full_conn_ietf.c
index ebd702d92..9e83f5ce3 100644
--- a/src/liblsquic/lsquic_full_conn_ietf.c
+++ b/src/liblsquic/lsquic_full_conn_ietf.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_full_conn_ietf.c -- IETF QUIC connection.
  */
@@ -2931,6 +2931,7 @@ ietf_full_conn_ci_abort (struct lsquic_conn *lconn)
     struct ietf_full_conn *conn = (struct ietf_full_conn *) lconn;
     LSQ_INFO("User aborted connection");
     conn->ifc_flags |= IFC_ABORTED;
+    lsquic_engine_add_conn_to_tickable(conn->ifc_enpub, lconn);
 }
 
 
@@ -4114,6 +4115,13 @@ ietf_full_conn_ci_is_tickable (struct lsquic_conn *lconn)
             return 1;
         }
 
+    if (conn->ifc_flags & IFC_IMMEDIATE_CLOSE_FLAGS)
+    {
+        LSQ_DEBUG("tickable: immediate close flags: 0x%X",
+            (unsigned) (conn->ifc_flags & IFC_IMMEDIATE_CLOSE_FLAGS));
+        return 1;
+    }
+
     LSQ_DEBUG("not tickable");
     return 0;
 }
diff --git a/src/liblsquic/lsquic_global.c b/src/liblsquic/lsquic_global.c
index 0cf9cb0fa..c16da90b9 100644
--- a/src/liblsquic/lsquic_global.c
+++ b/src/liblsquic/lsquic_global.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * Global state
  */
diff --git a/src/liblsquic/lsquic_handshake.c b/src/liblsquic/lsquic_handshake.c
index 871d24bb7..c96b90b09 100644
--- a/src/liblsquic/lsquic_handshake.c
+++ b/src/liblsquic/lsquic_handshake.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #define _GNU_SOURCE         /* for memmem */
 
 #include <assert.h>
diff --git a/src/liblsquic/lsquic_handshake.h b/src/liblsquic/lsquic_handshake.h
index ad3e8bf80..d16fedac9 100644
--- a/src/liblsquic/lsquic_handshake.h
+++ b/src/liblsquic/lsquic_handshake.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_HANDSHAKE_H
 #define LSQUIC_HANDSHAKE_H 1
 
diff --git a/src/liblsquic/lsquic_hash.c b/src/liblsquic/lsquic_hash.c
index 89996c8e5..7ac07b340 100644
--- a/src/liblsquic/lsquic_hash.c
+++ b/src/liblsquic/lsquic_hash.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_hash.c
  */
diff --git a/src/liblsquic/lsquic_hash.h b/src/liblsquic/lsquic_hash.h
index af7c9ba9a..9fb99e8b0 100644
--- a/src/liblsquic/lsquic_hash.h
+++ b/src/liblsquic/lsquic_hash.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_hash.c -- A generic hash
  */
diff --git a/src/liblsquic/lsquic_hcsi_reader.c b/src/liblsquic/lsquic_hcsi_reader.c
index 61bc10ac4..671ef2c87 100644
--- a/src/liblsquic/lsquic_hcsi_reader.c
+++ b/src/liblsquic/lsquic_hcsi_reader.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <inttypes.h>
 #include <stddef.h>
diff --git a/src/liblsquic/lsquic_hcsi_reader.h b/src/liblsquic/lsquic_hcsi_reader.h
index baf139830..44360eb3a 100644
--- a/src/liblsquic/lsquic_hcsi_reader.h
+++ b/src/liblsquic/lsquic_hcsi_reader.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_hcsi_reader.h -- HTTP Control Stream Incoming (HCSI) reader
  */
diff --git a/src/liblsquic/lsquic_hcso_writer.c b/src/liblsquic/lsquic_hcso_writer.c
index 7215f1799..efc968249 100644
--- a/src/liblsquic/lsquic_hcso_writer.c
+++ b/src/liblsquic/lsquic_hcso_writer.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_hcso_writer.c - write to outgoing HTTP Control Stream
  */
diff --git a/src/liblsquic/lsquic_hcso_writer.h b/src/liblsquic/lsquic_hcso_writer.h
index f7e61914c..8809e4443 100644
--- a/src/liblsquic/lsquic_hcso_writer.h
+++ b/src/liblsquic/lsquic_hcso_writer.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_hcso_writer.h
  */
diff --git a/src/liblsquic/lsquic_headers.h b/src/liblsquic/lsquic_headers.h
index f668956d8..f867601d5 100644
--- a/src/liblsquic/lsquic_headers.h
+++ b/src/liblsquic/lsquic_headers.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_HEADERS_H
 #define LSQUIC_HEADERS_H 1
 
diff --git a/src/liblsquic/lsquic_headers_stream.c b/src/liblsquic/lsquic_headers_stream.c
index 48eb851f5..c69feda76 100644
--- a/src/liblsquic/lsquic_headers_stream.c
+++ b/src/liblsquic/lsquic_headers_stream.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * HEADERS stream logic
  */
diff --git a/src/liblsquic/lsquic_headers_stream.h b/src/liblsquic/lsquic_headers_stream.h
index aebc1f5b7..fcf309a1f 100644
--- a/src/liblsquic/lsquic_headers_stream.h
+++ b/src/liblsquic/lsquic_headers_stream.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_headers_stream.h -- HEADERS stream interface
  */
diff --git a/src/liblsquic/lsquic_hkdf.c b/src/liblsquic/lsquic_hkdf.c
index 70cca0278..ba48d568a 100644
--- a/src/liblsquic/lsquic_hkdf.c
+++ b/src/liblsquic/lsquic_hkdf.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/src/liblsquic/lsquic_hkdf.h b/src/liblsquic/lsquic_hkdf.h
index 4561f7885..d32b7d181 100644
--- a/src/liblsquic/lsquic_hkdf.h
+++ b/src/liblsquic/lsquic_hkdf.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_HKDF_H
 #define LSQUIC_HKDF_H 1
 
diff --git a/src/liblsquic/lsquic_hpi.c b/src/liblsquic/lsquic_hpi.c
index 025e60008..1c78268e5 100644
--- a/src/liblsquic/lsquic_hpi.c
+++ b/src/liblsquic/lsquic_hpi.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_hpi.c - implementation of (Extensible) HTTP Priority Iterator.
  */
diff --git a/src/liblsquic/lsquic_hpi.h b/src/liblsquic/lsquic_hpi.h
index 14f0283c4..45bc44b3a 100644
--- a/src/liblsquic/lsquic_hpi.h
+++ b/src/liblsquic/lsquic_hpi.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_hpi.h - HPI: (Extensible) HTTP Priority Iterator
  *
diff --git a/src/liblsquic/lsquic_hq.h b/src/liblsquic/lsquic_hq.h
index f88ce2c57..44984e343 100644
--- a/src/liblsquic/lsquic_hq.h
+++ b/src/liblsquic/lsquic_hq.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_hq.h -- HTTP/3 (originally "HTTP over QUIC" or HQ) types
  */
diff --git a/src/liblsquic/lsquic_hspack_valid.c b/src/liblsquic/lsquic_hspack_valid.c
index a59bfb785..30d7792a5 100644
--- a/src/liblsquic/lsquic_hspack_valid.c
+++ b/src/liblsquic/lsquic_hspack_valid.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_hspack_valid.c -- Handshake packet validator.
  *
diff --git a/src/liblsquic/lsquic_http.c b/src/liblsquic/lsquic_http.c
index 932c4a9e9..af07512e2 100644
--- a/src/liblsquic/lsquic_http.c
+++ b/src/liblsquic/lsquic_http.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* Various HTTP-related functions. */
 
 #include <stddef.h>
diff --git a/src/liblsquic/lsquic_http1x_if.c b/src/liblsquic/lsquic_http1x_if.c
index d7fcfd251..b8fd90704 100644
--- a/src/liblsquic/lsquic_http1x_if.c
+++ b/src/liblsquic/lsquic_http1x_if.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <ctype.h>
 #include <stddef.h>
diff --git a/src/liblsquic/lsquic_http1x_if.h b/src/liblsquic/lsquic_http1x_if.h
index 354860883..2e6ef85d7 100644
--- a/src/liblsquic/lsquic_http1x_if.h
+++ b/src/liblsquic/lsquic_http1x_if.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_HTTP1X_IF_H
 #define LSQUIC_HTTP1X_IF_H 1
 
diff --git a/src/liblsquic/lsquic_ietf.h b/src/liblsquic/lsquic_ietf.h
index 18485b9b7..e0bfc136c 100644
--- a/src/liblsquic/lsquic_ietf.h
+++ b/src/liblsquic/lsquic_ietf.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_IETF_H
 #define LSQUIC_IETF_H 1
 
diff --git a/src/liblsquic/lsquic_int_types.h b/src/liblsquic/lsquic_int_types.h
index 1e4a124d7..9b48d1a3b 100644
--- a/src/liblsquic/lsquic_int_types.h
+++ b/src/liblsquic/lsquic_int_types.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_INT_TYPES_H
 #define LSQUIC_INT_TYPES_H 1
 
diff --git a/src/liblsquic/lsquic_logger.c b/src/liblsquic/lsquic_logger.c
index 5f4c89c8a..785bccdcf 100644
--- a/src/liblsquic/lsquic_logger.c
+++ b/src/liblsquic/lsquic_logger.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * LSQUIC Logger implementation.
  */
diff --git a/src/liblsquic/lsquic_logger.h b/src/liblsquic/lsquic_logger.h
index 49da03f3d..1e0e26762 100644
--- a/src/liblsquic/lsquic_logger.h
+++ b/src/liblsquic/lsquic_logger.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_logger.h -- logging functions and macros.
  *
diff --git a/src/liblsquic/lsquic_malo.c b/src/liblsquic/lsquic_malo.c
index fd3598db6..45e72aacf 100644
--- a/src/liblsquic/lsquic_malo.c
+++ b/src/liblsquic/lsquic_malo.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_malo.c -- malo allocator implementation.
  *
diff --git a/src/liblsquic/lsquic_malo.h b/src/liblsquic/lsquic_malo.h
index aebc53f47..270bca383 100644
--- a/src/liblsquic/lsquic_malo.h
+++ b/src/liblsquic/lsquic_malo.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_malo.h -- Fast allocator for fixed-sized objects.
  */
diff --git a/src/liblsquic/lsquic_min_heap.c b/src/liblsquic/lsquic_min_heap.c
index 03af5c7d9..4935756d5 100644
--- a/src/liblsquic/lsquic_min_heap.c
+++ b/src/liblsquic/lsquic_min_heap.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_min_heap.c
  */
diff --git a/src/liblsquic/lsquic_min_heap.h b/src/liblsquic/lsquic_min_heap.h
index 7b2e8c406..35ada4a87 100644
--- a/src/liblsquic/lsquic_min_heap.h
+++ b/src/liblsquic/lsquic_min_heap.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_min_heap.h -- Min-heap for pointers
  */
diff --git a/src/liblsquic/lsquic_mini_conn.c b/src/liblsquic/lsquic_mini_conn.c
index 593362195..10b53ac7e 100644
--- a/src/liblsquic/lsquic_mini_conn.c
+++ b/src/liblsquic/lsquic_mini_conn.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_mini_conn.c -- Mini connection.
  *
diff --git a/src/liblsquic/lsquic_mini_conn.h b/src/liblsquic/lsquic_mini_conn.h
index 43c759d05..ddff7755f 100644
--- a/src/liblsquic/lsquic_mini_conn.h
+++ b/src/liblsquic/lsquic_mini_conn.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_mini_conn.h -- Mini-connection
  *
diff --git a/src/liblsquic/lsquic_mini_conn_ietf.c b/src/liblsquic/lsquic_mini_conn_ietf.c
index 02e28ffc7..1d8bcc5d1 100644
--- a/src/liblsquic/lsquic_mini_conn_ietf.c
+++ b/src/liblsquic/lsquic_mini_conn_ietf.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_mini_conn_ietf.c -- Mini connection used by the IETF QUIC
  */
diff --git a/src/liblsquic/lsquic_mini_conn_ietf.h b/src/liblsquic/lsquic_mini_conn_ietf.h
index 93b11f862..1af352908 100644
--- a/src/liblsquic/lsquic_mini_conn_ietf.h
+++ b/src/liblsquic/lsquic_mini_conn_ietf.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_mini_conn_ietf.h -- Mini connection used by the IETF QUIC
  */
diff --git a/src/liblsquic/lsquic_minmax.c b/src/liblsquic/lsquic_minmax.c
index 102d4d86a..4eb5f0f9f 100644
--- a/src/liblsquic/lsquic_minmax.c
+++ b/src/liblsquic/lsquic_minmax.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * Based on Google code released under BSD license here:
  *  https://groups.google.com/forum/#!topic/bbr-dev/3RTgkzi5ZD8
diff --git a/src/liblsquic/lsquic_minmax.h b/src/liblsquic/lsquic_minmax.h
index ef95c004c..cf1420fe0 100644
--- a/src/liblsquic/lsquic_minmax.h
+++ b/src/liblsquic/lsquic_minmax.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_MINMAX_H
 #define LSQUIC_MINMAX_H
 
diff --git a/src/liblsquic/lsquic_mm.c b/src/liblsquic/lsquic_mm.c
index daa068630..3e2141e6f 100644
--- a/src/liblsquic/lsquic_mm.c
+++ b/src/liblsquic/lsquic_mm.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_mm.c -- Memory manager.
  */
diff --git a/src/liblsquic/lsquic_mm.h b/src/liblsquic/lsquic_mm.h
index 88ee80234..14f6169b9 100644
--- a/src/liblsquic/lsquic_mm.h
+++ b/src/liblsquic/lsquic_mm.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_mm.h -- Memory manager.
  *
diff --git a/src/liblsquic/lsquic_pacer.c b/src/liblsquic/lsquic_pacer.c
index 11291543f..af188caa6 100644
--- a/src/liblsquic/lsquic_pacer.c
+++ b/src/liblsquic/lsquic_pacer.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <inttypes.h>
 #include <stdint.h>
diff --git a/src/liblsquic/lsquic_pacer.h b/src/liblsquic/lsquic_pacer.h
index 63cac3a5b..131d94db6 100644
--- a/src/liblsquic/lsquic_pacer.h
+++ b/src/liblsquic/lsquic_pacer.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_PACER_H
 #define LSQUIC_PACER_H 1
 
diff --git a/src/liblsquic/lsquic_packet_common.c b/src/liblsquic/lsquic_packet_common.c
index 82a62a747..ae959ba58 100644
--- a/src/liblsquic/lsquic_packet_common.c
+++ b/src/liblsquic/lsquic_packet_common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_packet_common.c -- some common packet-related routines
  */
diff --git a/src/liblsquic/lsquic_packet_common.h b/src/liblsquic/lsquic_packet_common.h
index 3148093d2..056ec0a37 100644
--- a/src/liblsquic/lsquic_packet_common.h
+++ b/src/liblsquic/lsquic_packet_common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_PACKET_COMMON_H
 #define LSQUIC_PACKET_COMMON_H 1
 
diff --git a/src/liblsquic/lsquic_packet_gquic.c b/src/liblsquic/lsquic_packet_gquic.c
index 95cc9437c..016170727 100644
--- a/src/liblsquic/lsquic_packet_gquic.c
+++ b/src/liblsquic/lsquic_packet_gquic.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <stdint.h>
 #include <stdlib.h>
 
diff --git a/src/liblsquic/lsquic_packet_gquic.h b/src/liblsquic/lsquic_packet_gquic.h
index c23561a76..e430b9935 100644
--- a/src/liblsquic/lsquic_packet_gquic.h
+++ b/src/liblsquic/lsquic_packet_gquic.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_PACKET_GQUIC_H
 #define LSQUIC_PACKET_GQUIC_H 1
 
diff --git a/src/liblsquic/lsquic_packet_ietf.h b/src/liblsquic/lsquic_packet_ietf.h
index 1208e15c7..35c4a601d 100644
--- a/src/liblsquic/lsquic_packet_ietf.h
+++ b/src/liblsquic/lsquic_packet_ietf.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_PACKET_IETF_H
 #define LSQUIC_PACKET_IETF_H 1
 
diff --git a/src/liblsquic/lsquic_packet_in.c b/src/liblsquic/lsquic_packet_in.c
index df9a0d60c..83d9731c7 100644
--- a/src/liblsquic/lsquic_packet_in.c
+++ b/src/liblsquic/lsquic_packet_in.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/src/liblsquic/lsquic_packet_in.h b/src/liblsquic/lsquic_packet_in.h
index d135cc0dc..3651bbd40 100644
--- a/src/liblsquic/lsquic_packet_in.h
+++ b/src/liblsquic/lsquic_packet_in.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_packet_in.h
  */
diff --git a/src/liblsquic/lsquic_packet_out.c b/src/liblsquic/lsquic_packet_out.c
index 9bb6b8f6f..d4b4f47f8 100644
--- a/src/liblsquic/lsquic_packet_out.c
+++ b/src/liblsquic/lsquic_packet_out.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_packet_out.c
  */
diff --git a/src/liblsquic/lsquic_packet_out.h b/src/liblsquic/lsquic_packet_out.h
index 3c7245ecb..5d8820f53 100644
--- a/src/liblsquic/lsquic_packet_out.h
+++ b/src/liblsquic/lsquic_packet_out.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_packet_out.h -- Structure and routines dealing with packet_out
  */
diff --git a/src/liblsquic/lsquic_packet_resize.c b/src/liblsquic/lsquic_packet_resize.c
index dc85c051f..92d73880b 100644
--- a/src/liblsquic/lsquic_packet_resize.c
+++ b/src/liblsquic/lsquic_packet_resize.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* Functions to resize packets */
 
 #include <assert.h>
diff --git a/src/liblsquic/lsquic_packet_resize.h b/src/liblsquic/lsquic_packet_resize.h
index 0201901b4..5510c8e22 100644
--- a/src/liblsquic/lsquic_packet_resize.h
+++ b/src/liblsquic/lsquic_packet_resize.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_packet_resize.h -- functions to resize packets
  */
diff --git a/src/liblsquic/lsquic_parse.h b/src/liblsquic/lsquic_parse.h
index 4f1efbdbb..e702fe64b 100644
--- a/src/liblsquic/lsquic_parse.h
+++ b/src/liblsquic/lsquic_parse.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_PARSE_H
 #define LSQUIC_PARSE_H 1
 
diff --git a/src/liblsquic/lsquic_parse_Q046.c b/src/liblsquic/lsquic_parse_Q046.c
index a5fb49a43..ecb062dc0 100644
--- a/src/liblsquic/lsquic_parse_Q046.c
+++ b/src/liblsquic/lsquic_parse_Q046.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_parse_Q046.c -- Parsing functions specific to GQUIC Q046
  */
diff --git a/src/liblsquic/lsquic_parse_Q050.c b/src/liblsquic/lsquic_parse_Q050.c
index abc8e0d9c..029a1f4a0 100644
--- a/src/liblsquic/lsquic_parse_Q050.c
+++ b/src/liblsquic/lsquic_parse_Q050.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_parse_Q050.c -- Parsing functions specific to GQUIC Q050
  */
diff --git a/src/liblsquic/lsquic_parse_common.c b/src/liblsquic/lsquic_parse_common.c
index 94307edf2..8fe48f352 100644
--- a/src/liblsquic/lsquic_parse_common.c
+++ b/src/liblsquic/lsquic_parse_common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <string.h>
 #include <sys/queue.h>
diff --git a/src/liblsquic/lsquic_parse_common.h b/src/liblsquic/lsquic_parse_common.h
index 214998251..30ffb9b8c 100644
--- a/src/liblsquic/lsquic_parse_common.h
+++ b/src/liblsquic/lsquic_parse_common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_parse_common.h
  */
diff --git a/src/liblsquic/lsquic_parse_gquic_be.c b/src/liblsquic/lsquic_parse_gquic_be.c
index c8a8689c1..bc80d5dcb 100644
--- a/src/liblsquic/lsquic_parse_gquic_be.c
+++ b/src/liblsquic/lsquic_parse_gquic_be.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_parse_gquic_be.c -- Parsing functions specific to big-endian
  *                              (now only Q043) GQUIC.
diff --git a/src/liblsquic/lsquic_parse_gquic_be.h b/src/liblsquic/lsquic_parse_gquic_be.h
index 30d27dc3e..4f8f0bd8c 100644
--- a/src/liblsquic/lsquic_parse_gquic_be.h
+++ b/src/liblsquic/lsquic_parse_gquic_be.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_PARSE_GQUIC_BE_H
 #define LSQUIC_PARSE_GQUIC_BE_H
 
diff --git a/src/liblsquic/lsquic_parse_gquic_common.c b/src/liblsquic/lsquic_parse_gquic_common.c
index ac324b1be..cfaecc88f 100644
--- a/src/liblsquic/lsquic_parse_gquic_common.c
+++ b/src/liblsquic/lsquic_parse_gquic_common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_parse_gquic_common.c -- Parsing functions common to GQUIC
  */
diff --git a/src/liblsquic/lsquic_parse_ietf.h b/src/liblsquic/lsquic_parse_ietf.h
index 4dbcfca96..6ec1664f2 100644
--- a/src/liblsquic/lsquic_parse_ietf.h
+++ b/src/liblsquic/lsquic_parse_ietf.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_PARSE_IETF_H
 #define LSQUIC_PARSE_IETF_H 1
 
diff --git a/src/liblsquic/lsquic_parse_ietf_v1.c b/src/liblsquic/lsquic_parse_ietf_v1.c
index 7639b7964..0871e82dd 100644
--- a/src/liblsquic/lsquic_parse_ietf_v1.c
+++ b/src/liblsquic/lsquic_parse_ietf_v1.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_parse_ietf_v1.c -- Parsing functions specific to IETF QUIC v1
  */
diff --git a/src/liblsquic/lsquic_parse_iquic_common.c b/src/liblsquic/lsquic_parse_iquic_common.c
index ad149af10..d4c1a6464 100644
--- a/src/liblsquic/lsquic_parse_iquic_common.c
+++ b/src/liblsquic/lsquic_parse_iquic_common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * Parsing routines shared by all IETF QUIC versions.
  */
diff --git a/src/liblsquic/lsquic_pr_queue.c b/src/liblsquic/lsquic_pr_queue.c
index 501315238..e605c6774 100644
--- a/src/liblsquic/lsquic_pr_queue.c
+++ b/src/liblsquic/lsquic_pr_queue.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_pr_queue.c -- packet request queue.
  */
diff --git a/src/liblsquic/lsquic_pr_queue.h b/src/liblsquic/lsquic_pr_queue.h
index d6068814c..439f4bd8a 100644
--- a/src/liblsquic/lsquic_pr_queue.h
+++ b/src/liblsquic/lsquic_pr_queue.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_pr_queue.h -- a queue of packet requests
  *
diff --git a/src/liblsquic/lsquic_purga.c b/src/liblsquic/lsquic_purga.c
index 097eb28c8..817e354ca 100644
--- a/src/liblsquic/lsquic_purga.c
+++ b/src/liblsquic/lsquic_purga.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <errno.h>
 #include <inttypes.h>
 #include <stddef.h>
diff --git a/src/liblsquic/lsquic_purga.h b/src/liblsquic/lsquic_purga.h
index 7a91665d8..c28e06a29 100644
--- a/src/liblsquic/lsquic_purga.h
+++ b/src/liblsquic/lsquic_purga.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_purga.h -- Purgatory for CIDs
  *
diff --git a/src/liblsquic/lsquic_push_promise.h b/src/liblsquic/lsquic_push_promise.h
index 73e1b916a..cf936d083 100644
--- a/src/liblsquic/lsquic_push_promise.h
+++ b/src/liblsquic/lsquic_push_promise.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_PUSH_PROMISE_H
 #define LSQUIC_PUSH_PROMISE_H 1
 
diff --git a/src/liblsquic/lsquic_qdec_hdl.c b/src/liblsquic/lsquic_qdec_hdl.c
index a2fedebb3..0dda8e046 100644
--- a/src/liblsquic/lsquic_qdec_hdl.c
+++ b/src/liblsquic/lsquic_qdec_hdl.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_qdec_hdl.c -- QPACK decoder streams handler
  */
diff --git a/src/liblsquic/lsquic_qdec_hdl.h b/src/liblsquic/lsquic_qdec_hdl.h
index be7cf0e9c..8c349c6b8 100644
--- a/src/liblsquic/lsquic_qdec_hdl.h
+++ b/src/liblsquic/lsquic_qdec_hdl.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_qdec_hdl.h -- QPACK decoder streams handler
  *
diff --git a/src/liblsquic/lsquic_qenc_hdl.c b/src/liblsquic/lsquic_qenc_hdl.c
index 19361c587..42a667533 100644
--- a/src/liblsquic/lsquic_qenc_hdl.c
+++ b/src/liblsquic/lsquic_qenc_hdl.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_qenc_hdl.c -- QPACK encoder streams handler
  */
diff --git a/src/liblsquic/lsquic_qenc_hdl.h b/src/liblsquic/lsquic_qenc_hdl.h
index 4de2e8aec..37736dd87 100644
--- a/src/liblsquic/lsquic_qenc_hdl.h
+++ b/src/liblsquic/lsquic_qenc_hdl.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_qenc_hdl.h -- QPACK encoder streams handler
  *
diff --git a/src/liblsquic/lsquic_qlog.c b/src/liblsquic/lsquic_qlog.c
index 42404bc84..469aa516e 100644
--- a/src/liblsquic/lsquic_qlog.c
+++ b/src/liblsquic/lsquic_qlog.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/src/liblsquic/lsquic_qlog.h b/src/liblsquic/lsquic_qlog.h
index 58cb9b9a4..61d2f71d2 100644
--- a/src/liblsquic/lsquic_qlog.h
+++ b/src/liblsquic/lsquic_qlog.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_qlog.h -- QLOG Event logger
  */
diff --git a/src/liblsquic/lsquic_qpack_dec_logger.h b/src/liblsquic/lsquic_qpack_dec_logger.h
index dfe3a0092..c9739d3eb 100644
--- a/src/liblsquic/lsquic_qpack_dec_logger.h
+++ b/src/liblsquic/lsquic_qpack_dec_logger.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* This header file is included into lsqpack.c */
 
 #include "lsquic.h"
diff --git a/src/liblsquic/lsquic_qpack_enc_logger.h b/src/liblsquic/lsquic_qpack_enc_logger.h
index e467c5be9..9dbf85858 100644
--- a/src/liblsquic/lsquic_qpack_enc_logger.h
+++ b/src/liblsquic/lsquic_qpack_enc_logger.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* This header file is included into lsqpack.c */
 
 #include "lsquic.h"
diff --git a/src/liblsquic/lsquic_qpack_exp.c b/src/liblsquic/lsquic_qpack_exp.c
index 5e26a93dd..f25dc71cd 100644
--- a/src/liblsquic/lsquic_qpack_exp.c
+++ b/src/liblsquic/lsquic_qpack_exp.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/liblsquic/lsquic_qpack_exp.h b/src/liblsquic/lsquic_qpack_exp.h
index 224e2271c..7f39708b5 100644
--- a/src/liblsquic/lsquic_qpack_exp.h
+++ b/src/liblsquic/lsquic_qpack_exp.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* QPACK Experiment record */
 
 #ifndef LSQUIC_QPACK_EXP_H
diff --git a/src/liblsquic/lsquic_qtags.h b/src/liblsquic/lsquic_qtags.h
index 73adf7f5a..beade102b 100644
--- a/src/liblsquic/lsquic_qtags.h
+++ b/src/liblsquic/lsquic_qtags.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_QTAGS_H
 #define LSQUIC_QTAGS_H 1
 
diff --git a/src/liblsquic/lsquic_rechist.c b/src/liblsquic/lsquic_rechist.c
index 2ccc29c84..e9a6c327c 100644
--- a/src/liblsquic/lsquic_rechist.c
+++ b/src/liblsquic/lsquic_rechist.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_rechist.c -- History of received packets.
  */
diff --git a/src/liblsquic/lsquic_rechist.h b/src/liblsquic/lsquic_rechist.h
index 3d454206d..0f7894b98 100644
--- a/src/liblsquic/lsquic_rechist.h
+++ b/src/liblsquic/lsquic_rechist.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_rechist.h -- History of received packets.
  *
diff --git a/src/liblsquic/lsquic_rtt.c b/src/liblsquic/lsquic_rtt.c
index 09cd07115..90edf2139 100644
--- a/src/liblsquic/lsquic_rtt.c
+++ b/src/liblsquic/lsquic_rtt.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_rtt.c -- RTT calculation
  */
diff --git a/src/liblsquic/lsquic_rtt.h b/src/liblsquic/lsquic_rtt.h
index 585530465..e31331d05 100644
--- a/src/liblsquic/lsquic_rtt.h
+++ b/src/liblsquic/lsquic_rtt.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_rtt.h -- RTT calculation
  */
diff --git a/src/liblsquic/lsquic_send_ctl.c b/src/liblsquic/lsquic_send_ctl.c
index 504877761..b6b5eef5c 100644
--- a/src/liblsquic/lsquic_send_ctl.c
+++ b/src/liblsquic/lsquic_send_ctl.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_send_ctl.c -- Logic for sending and sent packets
  */
diff --git a/src/liblsquic/lsquic_send_ctl.h b/src/liblsquic/lsquic_send_ctl.h
index 401c14f11..798858b53 100644
--- a/src/liblsquic/lsquic_send_ctl.h
+++ b/src/liblsquic/lsquic_send_ctl.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_SEND_CTL_H
 #define LSQUIC_SEND_CTL_H 1
 
diff --git a/src/liblsquic/lsquic_senhist.c b/src/liblsquic/lsquic_senhist.c
index 6de009741..ca123af38 100644
--- a/src/liblsquic/lsquic_senhist.c
+++ b/src/liblsquic/lsquic_senhist.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_senhist.c -- Sent history implementation
  */
diff --git a/src/liblsquic/lsquic_senhist.h b/src/liblsquic/lsquic_senhist.h
index 8755e6d94..8120c8c90 100644
--- a/src/liblsquic/lsquic_senhist.h
+++ b/src/liblsquic/lsquic_senhist.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_senhist.h -- History sent packets.
  *
diff --git a/src/liblsquic/lsquic_set.c b/src/liblsquic/lsquic_set.c
index 681f05dbb..66d97d3f6 100644
--- a/src/liblsquic/lsquic_set.c
+++ b/src/liblsquic/lsquic_set.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_set.c -- A set implementation.
  *
diff --git a/src/liblsquic/lsquic_set.h b/src/liblsquic/lsquic_set.h
index d7d7db2e9..09e6989fb 100644
--- a/src/liblsquic/lsquic_set.h
+++ b/src/liblsquic/lsquic_set.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_set.h -- A set implementation.
  *
diff --git a/src/liblsquic/lsquic_sfcw.c b/src/liblsquic/lsquic_sfcw.c
index f5e4bf01b..1b14be3b2 100644
--- a/src/liblsquic/lsquic_sfcw.c
+++ b/src/liblsquic/lsquic_sfcw.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <inttypes.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/liblsquic/lsquic_sfcw.h b/src/liblsquic/lsquic_sfcw.h
index 37d55bd71..a20691035 100644
--- a/src/liblsquic/lsquic_sfcw.h
+++ b/src/liblsquic/lsquic_sfcw.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_sfcw.h -- Stream flow control window functions
  */
diff --git a/src/liblsquic/lsquic_shsk_stream.c b/src/liblsquic/lsquic_shsk_stream.c
index 5621b14e6..b71709769 100644
--- a/src/liblsquic/lsquic_shsk_stream.c
+++ b/src/liblsquic/lsquic_shsk_stream.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * Stream/crypto handshake adapter for the server side.  Since on the server
  * side, the handshake logic is handled in mini conn, this adapter does not
diff --git a/src/liblsquic/lsquic_shsk_stream.h b/src/liblsquic/lsquic_shsk_stream.h
index bdd24dc33..edc230c4f 100644
--- a/src/liblsquic/lsquic_shsk_stream.h
+++ b/src/liblsquic/lsquic_shsk_stream.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * Stream/crypto handshake adapter for the server side.  See implementation
  * for more comments and explanation.
diff --git a/src/liblsquic/lsquic_sizes.h b/src/liblsquic/lsquic_sizes.h
index 96ce87f91..2d92ad422 100644
--- a/src/liblsquic/lsquic_sizes.h
+++ b/src/liblsquic/lsquic_sizes.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_SIZES_H
 #define LSQUIC_SIZES_H 1
 
diff --git a/src/liblsquic/lsquic_spi.c b/src/liblsquic/lsquic_spi.c
index 45e6ee6af..47e81a908 100644
--- a/src/liblsquic/lsquic_spi.c
+++ b/src/liblsquic/lsquic_spi.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_spi.c - implementation of Stream Priority Iterator.
  */
diff --git a/src/liblsquic/lsquic_spi.h b/src/liblsquic/lsquic_spi.h
index bf8f64f7c..e1ff6f5eb 100644
--- a/src/liblsquic/lsquic_spi.h
+++ b/src/liblsquic/lsquic_spi.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_spi.h - SPI: Stream Priority Iterator
  *
diff --git a/src/liblsquic/lsquic_stock_shi.c b/src/liblsquic/lsquic_stock_shi.c
index 4f59518c4..5a45582dd 100644
--- a/src/liblsquic/lsquic_stock_shi.c
+++ b/src/liblsquic/lsquic_stock_shi.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_stock_shi.c
  */
diff --git a/src/liblsquic/lsquic_stock_shi.h b/src/liblsquic/lsquic_stock_shi.h
index 9d7f551cc..0476cff97 100644
--- a/src/liblsquic/lsquic_stock_shi.h
+++ b/src/liblsquic/lsquic_stock_shi.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_stock_shi.h - Stock shared hash interface implementation.
  */
diff --git a/src/liblsquic/lsquic_str.c b/src/liblsquic/lsquic_str.c
index c2a3539ac..e0f3ea052 100644
--- a/src/liblsquic/lsquic_str.c
+++ b/src/liblsquic/lsquic_str.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_str.c
  *
diff --git a/src/liblsquic/lsquic_str.h b/src/liblsquic/lsquic_str.h
index c1dd81a46..1eb7e2bbc 100644
--- a/src/liblsquic/lsquic_str.h
+++ b/src/liblsquic/lsquic_str.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_str.h -- Some string routines.
  */
diff --git a/src/liblsquic/lsquic_stream.c b/src/liblsquic/lsquic_stream.c
index 2e22f4af3..6c29e7762 100644
--- a/src/liblsquic/lsquic_stream.c
+++ b/src/liblsquic/lsquic_stream.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_stream.c -- stream processing
  */
@@ -2952,7 +2952,8 @@ frame_hq_gen_read (void *ctx, void *begin_buf, size_t len, int *fin)
                 }
                 else
                 {
-                    /* TODO: abort connection?  Handle failure somehow */
+                    stream->conn_pub->lconn->cn_if->ci_internal_error(
+                        stream->conn_pub->lconn, "cannot activate HQ frame");
                     break;
                 }
             }
diff --git a/src/liblsquic/lsquic_stream.h b/src/liblsquic/lsquic_stream.h
index 8a956db47..a081adb82 100644
--- a/src/liblsquic/lsquic_stream.h
+++ b/src/liblsquic/lsquic_stream.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_STREAM_H
 #define LSQUIC_STREAM_H
 
diff --git a/src/liblsquic/lsquic_tokgen.c b/src/liblsquic/lsquic_tokgen.c
index 251428bd6..01fee268d 100644
--- a/src/liblsquic/lsquic_tokgen.c
+++ b/src/liblsquic/lsquic_tokgen.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/src/liblsquic/lsquic_tokgen.h b/src/liblsquic/lsquic_tokgen.h
index 878ce2f42..c7501206e 100644
--- a/src/liblsquic/lsquic_tokgen.h
+++ b/src/liblsquic/lsquic_tokgen.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_TOKEN_H
 #define LSQUIC_TOKEN_H 1
 
diff --git a/src/liblsquic/lsquic_trans_params.c b/src/liblsquic/lsquic_trans_params.c
index 6bfc64fdb..1c5fed45e 100644
--- a/src/liblsquic/lsquic_trans_params.c
+++ b/src/liblsquic/lsquic_trans_params.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_trans_params.c
  */
diff --git a/src/liblsquic/lsquic_trans_params.h b/src/liblsquic/lsquic_trans_params.h
index c33bfc7ee..03afbf1c3 100644
--- a/src/liblsquic/lsquic_trans_params.h
+++ b/src/liblsquic/lsquic_trans_params.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_trans_params.h -- Transport parameters types and functions.
  */
diff --git a/src/liblsquic/lsquic_trechist.c b/src/liblsquic/lsquic_trechist.c
index 34ade202c..e01d015de 100644
--- a/src/liblsquic/lsquic_trechist.c
+++ b/src/liblsquic/lsquic_trechist.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <limits.h>
 #include <stddef.h>
diff --git a/src/liblsquic/lsquic_trechist.h b/src/liblsquic/lsquic_trechist.h
index f5599fb46..b17fc8411 100644
--- a/src/liblsquic/lsquic_trechist.h
+++ b/src/liblsquic/lsquic_trechist.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * Tiny receive history.  It is used in IETF mini connection, where we want
  * to use as little memory as possible.  This data structure is an array of
diff --git a/src/liblsquic/lsquic_util.c b/src/liblsquic/lsquic_util.c
index dd83b39bd..7b2ba211b 100644
--- a/src/liblsquic/lsquic_util.c
+++ b/src/liblsquic/lsquic_util.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * Utility functions
  */
diff --git a/src/liblsquic/lsquic_util.h b/src/liblsquic/lsquic_util.h
index 5c80f303a..e2c22a113 100644
--- a/src/liblsquic/lsquic_util.h
+++ b/src/liblsquic/lsquic_util.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_util.h -- Utility functions
  */
diff --git a/src/liblsquic/lsquic_varint.c b/src/liblsquic/lsquic_varint.c
index af9b8f4eb..237ad3e32 100644
--- a/src/liblsquic/lsquic_varint.c
+++ b/src/liblsquic/lsquic_varint.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_varint.c -- routines dealing with IETF QUIC varint.
  */
diff --git a/src/liblsquic/lsquic_varint.h b/src/liblsquic/lsquic_varint.h
index df760604c..50a7bd3f1 100644
--- a/src/liblsquic/lsquic_varint.h
+++ b/src/liblsquic/lsquic_varint.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_VARINT_H
 #define LSQUIC_VARINT_H 1
 
diff --git a/src/liblsquic/lsquic_ver_neg.h b/src/liblsquic/lsquic_ver_neg.h
index 0b181d48b..a52c09859 100644
--- a/src/liblsquic/lsquic_ver_neg.h
+++ b/src/liblsquic/lsquic_ver_neg.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #ifndef LSQUIC_VER_NEG_H
 #define LSQUIC_VER_NEG_H
 
diff --git a/src/liblsquic/lsquic_version.c b/src/liblsquic/lsquic_version.c
index e6e04efc6..39faa09fc 100644
--- a/src/liblsquic/lsquic_version.c
+++ b/src/liblsquic/lsquic_version.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <string.h>
 
 #include "lsquic.h"
diff --git a/src/liblsquic/lsquic_version.h b/src/liblsquic/lsquic_version.h
index 505470269..46cf26085 100644
--- a/src/liblsquic/lsquic_version.h
+++ b/src/liblsquic/lsquic_version.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * lsquic_version.h -- version manipulation routines
  */
diff --git a/src/liblsquic/lsquic_xxhash.c b/src/liblsquic/lsquic_xxhash.c
index fc4cdf57a..fc50769b9 100644
--- a/src/liblsquic/lsquic_xxhash.c
+++ b/src/liblsquic/lsquic_xxhash.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
 xxHash - Fast Hash algorithm
 Copyright (C) 2012-2014, Yann Collet.
diff --git a/src/liblsquic/lsquic_xxhash.h b/src/liblsquic/lsquic_xxhash.h
index 77e36d04e..4a92f415f 100644
--- a/src/liblsquic/lsquic_xxhash.h
+++ b/src/liblsquic/lsquic_xxhash.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
    xxHash - Extremely Fast Hash algorithm
    Header File
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 843d539e7..6aa08d4f3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE.
+# Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE.
 INCLUDE_DIRECTORIES(../src/liblsquic)
 
 ENABLE_TESTING()
diff --git a/tests/graph_cubic.c b/tests/graph_cubic.c
index bb945f498..bf56da43d 100644
--- a/tests/graph_cubic.c
+++ b/tests/graph_cubic.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * This is not really a test: this program prints out cwnd histogram
  * for visual inspection.
diff --git a/tests/mini_parse.c b/tests/mini_parse.c
index da337b759..e05e2299f 100644
--- a/tests/mini_parse.c
+++ b/tests/mini_parse.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * Convert from our hexdump format to binary:
  *
diff --git a/tests/test_ack.c b/tests/test_ack.c
index 910c21ca7..ed866cba0 100644
--- a/tests/test_ack.c
+++ b/tests/test_ack.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* Test both generation and parsing of IETF ACK frames */
 
 #include <assert.h>
diff --git a/tests/test_ack_merge.c b/tests/test_ack_merge.c
index f8bbf7fda..e84fecd95 100644
--- a/tests/test_ack_merge.c
+++ b/tests/test_ack_merge.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* Test ACK merge */
 
 #include <assert.h>
diff --git a/tests/test_ackgen_gquic_be.c b/tests/test_ackgen_gquic_be.c
index bfd5f863f..749d8ac31 100644
--- a/tests/test_ackgen_gquic_be.c
+++ b/tests/test_ackgen_gquic_be.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * Test how ACK frame is encoded.  Receive history module is tested by a
  * separate unit test.
diff --git a/tests/test_ackparse_gquic_be.c b/tests/test_ackparse_gquic_be.c
index 2e4675156..211e08941 100644
--- a/tests/test_ackparse_gquic_be.c
+++ b/tests/test_ackparse_gquic_be.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_ackparse_ietf.c b/tests/test_ackparse_ietf.c
index 6421fdfde..147f9623a 100644
--- a/tests/test_ackparse_ietf.c
+++ b/tests/test_ackparse_ietf.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_alarmset.c b/tests/test_alarmset.c
index d96ef3a45..301a021de 100644
--- a/tests/test_alarmset.c
+++ b/tests/test_alarmset.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_alt_svc_ver.c b/tests/test_alt_svc_ver.c
index 00e69f1bf..b8d13d53f 100644
--- a/tests/test_alt_svc_ver.c
+++ b/tests/test_alt_svc_ver.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <string.h>
 
diff --git a/tests/test_arr.c b/tests/test_arr.c
index e93d3e47a..e27069bda 100644
--- a/tests/test_arr.c
+++ b/tests/test_arr.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 
 #include "lsquic_arr.h"
diff --git a/tests/test_attq.c b/tests/test_attq.c
index 27e48f0f1..36849f2de 100644
--- a/tests/test_attq.c
+++ b/tests/test_attq.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdlib.h>
 #include <sys/queue.h>
diff --git a/tests/test_blocked_gquic_be.c b/tests/test_blocked_gquic_be.c
index 8f79444db..02afda397 100644
--- a/tests/test_blocked_gquic_be.c
+++ b/tests/test_blocked_gquic_be.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_bw_sampler.c b/tests/test_bw_sampler.c
index 387ea3529..3011126c1 100644
--- a/tests/test_bw_sampler.c
+++ b/tests/test_bw_sampler.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* Test adapted from Chromium bandwidth_sampler_test.cc */
 // Copyright 2016 The Chromium Authors. All rights reserved.
 
diff --git a/tests/test_chlo_gen.c b/tests/test_chlo_gen.c
index cf041c374..4c3d5a500 100644
--- a/tests/test_chlo_gen.c
+++ b/tests/test_chlo_gen.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * test_chlo_gen.c -- Test Client Hello generation.
  */
diff --git a/tests/test_clear_aead.c b/tests/test_clear_aead.c
index 9b38d98c9..939ad3c3b 100644
--- a/tests/test_clear_aead.c
+++ b/tests/test_clear_aead.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * See
  *  https://github.com/quicwg/base-drafts/wiki/Test-Vector-for-the-Clear-Text-AEAD-key-derivation
diff --git a/tests/test_conn_close_gquic_be.c b/tests/test_conn_close_gquic_be.c
index 3335bc911..81dd4c849 100644
--- a/tests/test_conn_close_gquic_be.c
+++ b/tests/test_conn_close_gquic_be.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_conn_hash.c b/tests/test_conn_hash.c
index ad7b16553..5d1870c14 100644
--- a/tests/test_conn_hash.c
+++ b/tests/test_conn_hash.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/tests/test_crypto_gen.c b/tests/test_crypto_gen.c
index be8d75129..f071b5023 100644
--- a/tests/test_crypto_gen.c
+++ b/tests/test_crypto_gen.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_cubic.c b/tests/test_cubic.c
index 5b8cdd110..f7b4e6f79 100644
--- a/tests/test_cubic.c
+++ b/tests/test_cubic.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_dec.c b/tests/test_dec.c
index 67c62e644..3836bade6 100644
--- a/tests/test_dec.c
+++ b/tests/test_dec.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * test_dec.c -- Benchmark decryption using aligned and non-aligned buffers.
  */
diff --git a/tests/test_di_nocopy.c b/tests/test_di_nocopy.c
index 0cd733421..d90489e1e 100644
--- a/tests/test_di_nocopy.c
+++ b/tests/test_di_nocopy.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * Test the "nocopy" data in stream
  */
diff --git a/tests/test_elision.c b/tests/test_elision.c
index 6f9ef9970..46672c2f5 100644
--- a/tests/test_elision.c
+++ b/tests/test_elision.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/tests/test_engine_ctor.c b/tests/test_engine_ctor.c
index f31c30e58..39e83ace1 100644
--- a/tests/test_engine_ctor.c
+++ b/tests/test_engine_ctor.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/test_export_key.c b/tests/test_export_key.c
index 0716427a8..b674cf72e 100644
--- a/tests/test_export_key.c
+++ b/tests/test_export_key.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/test_frame_chop.c b/tests/test_frame_chop.c
index bfacd146f..6d906f1ef 100644
--- a/tests/test_frame_chop.c
+++ b/tests/test_frame_chop.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * Write several things to HEADERS stream and check the results.  What
  * varies is the amount of bytes that are written to stream every time.
diff --git a/tests/test_frame_reader.c b/tests/test_frame_reader.c
index 49bf3af5c..0028e8e53 100644
--- a/tests/test_frame_reader.c
+++ b/tests/test_frame_reader.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/tests/test_frame_rw.c b/tests/test_frame_rw.c
index be9f7a2ae..7d13876ab 100644
--- a/tests/test_frame_rw.c
+++ b/tests/test_frame_rw.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * Generate a few thousand headers, frame them using frame writer, read them
  * using frame reader, parse them, and compare with the original list: the
diff --git a/tests/test_frame_writer.c b/tests/test_frame_writer.c
index 02cd7d144..7f5825481 100644
--- a/tests/test_frame_writer.c
+++ b/tests/test_frame_writer.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/tests/test_goaway_gquic_be.c b/tests/test_goaway_gquic_be.c
index 6350c64d2..8c7dc3a47 100644
--- a/tests/test_goaway_gquic_be.c
+++ b/tests/test_goaway_gquic_be.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_h3_framing.c b/tests/test_h3_framing.c
index 31a63dac0..377501da1 100644
--- a/tests/test_h3_framing.c
+++ b/tests/test_h3_framing.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * test_h3_framing.c -- test generation of H3 frames
  */
diff --git a/tests/test_hcsi_reader.c b/tests/test_hcsi_reader.c
index efc3ba0f9..0e802ea2e 100644
--- a/tests/test_hcsi_reader.c
+++ b/tests/test_hcsi_reader.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <inttypes.h>
 #include <stdlib.h>
diff --git a/tests/test_hkdf.c b/tests/test_hkdf.c
index 1240eee6d..d699ae54a 100644
--- a/tests/test_hkdf.c
+++ b/tests/test_hkdf.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <string.h>
 #include <openssl/ssl.h>
diff --git a/tests/test_hpi.c b/tests/test_hpi.c
index 362f6855d..f481a4b44 100644
--- a/tests/test_hpi.c
+++ b/tests/test_hpi.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/tests/test_lsquic_hash.c b/tests/test_lsquic_hash.c
index 58dfe4557..36fb625bf 100644
--- a/tests/test_lsquic_hash.c
+++ b/tests/test_lsquic_hash.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/tests/test_malo.c b/tests/test_malo.c
index 5b6b3c00b..f7e67f2ff 100644
--- a/tests/test_malo.c
+++ b/tests/test_malo.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/tests/test_min_heap.c b/tests/test_min_heap.c
index e012b9c14..80100c930 100644
--- a/tests/test_min_heap.c
+++ b/tests/test_min_heap.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* Test min heap or benchmark heap creation */
 
 /* Floyd mechanism has been removed.  It's not faster. */
diff --git a/tests/test_minmax.c b/tests/test_minmax.c
index 1b468ab52..763a7ddd8 100644
--- a/tests/test_minmax.c
+++ b/tests/test_minmax.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* Tests adopted from Chromium windowed_filter_test.cc */
 // Copyright (c) 2016 The Chromium Authors. All rights reserved.
 
diff --git a/tests/test_packet_out.c b/tests/test_packet_out.c
index 2de33a46c..2b7441080 100644
--- a/tests/test_packet_out.c
+++ b/tests/test_packet_out.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/tests/test_packet_resize.c b/tests/test_packet_resize.c
index b9f7cfec7..0aa20d39b 100644
--- a/tests/test_packet_resize.c
+++ b/tests/test_packet_resize.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* Test packet resizing */
 
 #include <assert.h>
diff --git a/tests/test_packno_len.c b/tests/test_packno_len.c
index fe889ac40..f955e71be 100644
--- a/tests/test_packno_len.c
+++ b/tests/test_packno_len.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_parse_packet_in.c b/tests/test_parse_packet_in.c
index 0ea8b645d..648725596 100644
--- a/tests/test_parse_packet_in.c
+++ b/tests/test_parse_packet_in.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/tests/test_purga.c b/tests/test_purga.c
index 3eabbbc30..94a77c59e 100644
--- a/tests/test_purga.c
+++ b/tests/test_purga.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/test_qlog.c b/tests/test_qlog.c
index 617bfd856..9d916e75b 100644
--- a/tests/test_qlog.c
+++ b/tests/test_qlog.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_quic_be_floats.c b/tests/test_quic_be_floats.c
index cfa07350a..e9765b5b2 100644
--- a/tests/test_quic_be_floats.c
+++ b/tests/test_quic_be_floats.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_rechist.c b/tests/test_rechist.c
index 4949c58b9..5fa80e54f 100644
--- a/tests/test_rechist.c
+++ b/tests/test_rechist.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <inttypes.h>
 #include <stdio.h>
diff --git a/tests/test_reg_pkt_headergen.c b/tests/test_reg_pkt_headergen.c
index ca561370d..ea1f5e9ef 100644
--- a/tests/test_reg_pkt_headergen.c
+++ b/tests/test_reg_pkt_headergen.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_rst_stream_gquic_be.c b/tests/test_rst_stream_gquic_be.c
index 669cc33e0..9e474af3f 100644
--- a/tests/test_rst_stream_gquic_be.c
+++ b/tests/test_rst_stream_gquic_be.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_rst_stream_ietf.c b/tests/test_rst_stream_ietf.c
index 6e298747e..5c912fa07 100644
--- a/tests/test_rst_stream_ietf.c
+++ b/tests/test_rst_stream_ietf.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_rtt.c b/tests/test_rtt.c
index f7f5c53fd..63c10112b 100644
--- a/tests/test_rtt.c
+++ b/tests/test_rtt.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_send_headers.c b/tests/test_send_headers.c
index 3931ece5f..137f6b5ca 100644
--- a/tests/test_send_headers.c
+++ b/tests/test_send_headers.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * test_send_headers.c -- Test what happens when lsquic_stream_send_headers()
  * is called.
diff --git a/tests/test_senhist.c b/tests/test_senhist.c
index f9982511c..62bfa6d6d 100644
--- a/tests/test_senhist.c
+++ b/tests/test_senhist.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_set.c b/tests/test_set.c
index 1a0b8cff5..dd3280e63 100644
--- a/tests/test_set.c
+++ b/tests/test_set.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_sfcw.c b/tests/test_sfcw.c
index ca3e77f9a..7905c0c23 100644
--- a/tests/test_sfcw.c
+++ b/tests/test_sfcw.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdint.h>
diff --git a/tests/test_shi.c b/tests/test_shi.c
index 4cc39ca23..24bf756e7 100644
--- a/tests/test_shi.c
+++ b/tests/test_shi.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/test_some_packets.c b/tests/test_some_packets.c
index 8ad0efdce..79dce845d 100644
--- a/tests/test_some_packets.c
+++ b/tests/test_some_packets.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* Tests in this file have been migrated out of maintest.c */
 /* TODO: fix warnings */
 
diff --git a/tests/test_spi.c b/tests/test_spi.c
index 4bbed5cc9..2f1a6001f 100644
--- a/tests/test_spi.c
+++ b/tests/test_spi.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/tests/test_stop_waiting_gquic_be.c b/tests/test_stop_waiting_gquic_be.c
index 5f93095ba..c016ed26f 100644
--- a/tests/test_stop_waiting_gquic_be.c
+++ b/tests/test_stop_waiting_gquic_be.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_stream.c b/tests/test_stream.c
index a8aab0d91..011eb481f 100644
--- a/tests/test_stream.c
+++ b/tests/test_stream.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/tests/test_streamgen.c b/tests/test_streamgen.c
index 60af01d48..aac51ef31 100644
--- a/tests/test_streamgen.c
+++ b/tests/test_streamgen.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_streamparse.c b/tests/test_streamparse.c
index 365be11bd..d93ed193c 100644
--- a/tests/test_streamparse.c
+++ b/tests/test_streamparse.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_tokgen.c b/tests/test_tokgen.c
index b1e5e2900..9650e20c0 100644
--- a/tests/test_tokgen.c
+++ b/tests/test_tokgen.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test_trapa.c b/tests/test_trapa.c
index f20548c57..f3c4ed604 100644
--- a/tests/test_trapa.c
+++ b/tests/test_trapa.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*
  * test_trapa.c -- Test transport parameters.
  */
diff --git a/tests/test_trechist.c b/tests/test_trechist.c
index 360c21e26..adcf0fa95 100644
--- a/tests/test_trechist.c
+++ b/tests/test_trechist.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* Tests based on rechist tests */
 
 #include <assert.h>
diff --git a/tests/test_varint.c b/tests/test_varint.c
index 27bf0041c..de8f1b39c 100644
--- a/tests/test_varint.c
+++ b/tests/test_varint.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/tests/test_ver_nego.c b/tests/test_ver_nego.c
index 6ae3fe7d1..9a0217fe3 100644
--- a/tests/test_ver_nego.c
+++ b/tests/test_ver_nego.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_wuf_gquic_be.c b/tests/test_wuf_gquic_be.c
index 28b860b20..4fc28a90e 100644
--- a/tests/test_wuf_gquic_be.c
+++ b/tests/test_wuf_gquic_be.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/wincompat/README.txt b/wincompat/README.txt
index 15bce3346..18f7680b3 100644
--- a/wincompat/README.txt
+++ b/wincompat/README.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE.
+# Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE.
 - only debug and release are expected in the Cmakelists.txt. If you need a different config, please follow the model in that file to add it.
 
 - vcpkg does not have boringssl, so you'll have to build it yourself. Follow the instructions at the boringssl repository.
diff --git a/wincompat/getopt.c b/wincompat/getopt.c
index 4ce43a17d..eec55cba5 100644
--- a/wincompat/getopt.c
+++ b/wincompat/getopt.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* Getopt for GNU.
    NOTE: getopt is now part of the C library, so if you don't know what
    "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu
diff --git a/wincompat/getopt.h b/wincompat/getopt.h
index 74f8c6b00..ce78c3182 100644
--- a/wincompat/getopt.h
+++ b/wincompat/getopt.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* Declarations for getopt.
    Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
 
diff --git a/wincompat/getopt1.c b/wincompat/getopt1.c
index 4f360ab3e..948a7ed01 100644
--- a/wincompat/getopt1.c
+++ b/wincompat/getopt1.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /* getopt_long and getopt_long_only entry points for GNU getopt.
    Copyright (C) 1987, 88, 89, 90, 91, 92, 1993
 	Free Software Foundation, Inc.
diff --git a/wincompat/sys/queue.h b/wincompat/sys/queue.h
index 7261edad9..4bc39ab23 100644
--- a/wincompat/sys/queue.h
+++ b/wincompat/sys/queue.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/wincompat/vc_compat.h b/wincompat/vc_compat.h
index 7ec334d8c..d478257b3 100644
--- a/wincompat/vc_compat.h
+++ b/wincompat/vc_compat.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc.  See LICENSE. */
+/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE. */
 #pragma once
 #include <Windows.h>
 #include <winsock2.h>