From e02bc3157d0de31249300437fa86dd7da1a088f6 Mon Sep 17 00:00:00 2001
From: Dmitri Tikhonov <dtikhonov@litespeedtech.com>
Date: Tue, 17 Nov 2020 13:57:13 -0500
Subject: [PATCH] Release 2.12.14

- [BUGFIX] min RTO delay is 200 ms , not 1 second.
- [BUGFIX] calculate TLP timer correctly when only one packet is in
  flight.
- [BUGFIX] discard CRYPTO frames from lower levels after connection
  promotion.
- [BUGFIX] cancel path response if path could not be initialized.
- [BUGFIX] if push promise fails, do not invoke hset destructor.
---
 CHANGELOG        | 12 +++++++++---
 docs/conf.py     |  2 +-
 include/lsquic.h |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3e79b169f..57d8b966e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,12 @@
-2020-10-26
-    - 2.12.12
-    - Undo changes in 2.12.11
+2020-11-17
+    - 2.12.13
+    - [BUGFIX] min RTO delay is 200 ms , not 1 second.
+    - [BUGFIX] calculate TLP timer correctly when only one packet is in
+      flight.
+    - [BUGFIX] discard CRYPTO frames from lower levels after connection
+      promotion.
+    - [BUGFIX] cancel path response if path could not be initialized.
+    - [BUGFIX] if push promise fails, do not invoke hset destructor.
 
 2020-10-06
     - 2.12.10
diff --git a/docs/conf.py b/docs/conf.py
index 029d4d3c6..54b9f6809 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -26,7 +26,7 @@
 # The short X.Y version
 version = u'2.12'
 # The full version, including alpha/beta/rc tags
-release = u'2.12.11'
+release = u'2.12.14'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/include/lsquic.h b/include/lsquic.h
index 6020d7b2d..2de35524a 100644
--- a/include/lsquic.h
+++ b/include/lsquic.h
@@ -25,7 +25,7 @@ extern "C" {
 
 #define LSQUIC_MAJOR_VERSION 2
 #define LSQUIC_MINOR_VERSION 12
-#define LSQUIC_PATCH_VERSION 11
+#define LSQUIC_PATCH_VERSION 14
 
 /**
  * Engine flags: