diff --git a/CHANGELOG b/CHANGELOG
index 14a444b..32cf6a0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+2022-01-10
+    - 3.0.4
+    - Fix overly strict assert()
+    - Do not reset path MTU due to three lost_mtu_probe
+    - Fix handshake failure due to too many realy data
+    - Better build support for Windows platform
+    - Update ls-qpack to 2.2.3
+
 2021-09-30
     - 3.0.3
     - Generate ACK for DATAGRAM frame while avoid RETX (issue #312 #325).
diff --git a/appveyor-linux.yml b/appveyor-linux.yml
index c62a08e..ca42d89 100644
--- a/appveyor-linux.yml
+++ b/appveyor-linux.yml
@@ -25,7 +25,7 @@ install:
 
         cd boringssl
 
-        git checkout a2278d4d2cabe73f6663e3299ea7808edfa306b9
+        git checkout cf8d3ad3cea51cf7184307d54f465da62b7d8408
 
         cmake .
 
diff --git a/appveyor-windows.cmd b/appveyor-windows.cmd
index 354e21c..fac703f 100644
--- a/appveyor-windows.cmd
+++ b/appveyor-windows.cmd
@@ -5,7 +5,7 @@ if exist ".\boringssl\CMakeLists.txt" (
 ) else (
     git clone https://boringssl.googlesource.com/boringssl
     cd boringssl
-    git checkout a2278d4d2cabe73f6663e3299ea7808edfa306b9
+    git checkout cf8d3ad3cea51cf7184307d54f465da62b7d8408
     cmake -DCMAKE_GENERATOR_PLATFORM=x64 --config Debug -DBUILD_SHARED_LIBS=OFF -DOPENSSL_NO_ASM=1 .
     msbuild /m ALL_BUILD.vcxproj
     cd ..
diff --git a/docs/conf.py b/docs/conf.py
index 2832dd8..028b6dd 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -26,7 +26,7 @@ author = u'LiteSpeed Technologies'
 # The short X.Y version
 version = u'3.0'
 # The full version, including alpha/beta/rc tags
-release = u'3.0.3'
+release = u'3.0.4'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/include/lsquic.h b/include/lsquic.h
index cc51b7c..71c9e3c 100644
--- a/include/lsquic.h
+++ b/include/lsquic.h
@@ -25,7 +25,7 @@ extern "C" {
 
 #define LSQUIC_MAJOR_VERSION 3
 #define LSQUIC_MINOR_VERSION 0
-#define LSQUIC_PATCH_VERSION 3
+#define LSQUIC_PATCH_VERSION 4
 
 /**
  * Engine flags:
diff --git a/src/liblsquic/ls-qpack b/src/liblsquic/ls-qpack
index c74cd4b..7ba6f11 160000
--- a/src/liblsquic/ls-qpack
+++ b/src/liblsquic/ls-qpack
@@ -1 +1 @@
-Subproject commit c74cd4b2c3f97c069584615dc37fdd22a9110c80
+Subproject commit 7ba6f119e56e3709e25933d73dbb13c7ed242331
diff --git a/src/liblsquic/lsquic_parse_ietf_v1.c b/src/liblsquic/lsquic_parse_ietf_v1.c
index 0266e19..7638028 100644
--- a/src/liblsquic/lsquic_parse_ietf_v1.c
+++ b/src/liblsquic/lsquic_parse_ietf_v1.c
@@ -332,7 +332,7 @@ ietf_v1_gen_stream_frame (unsigned char *buf, size_t buf_len,
     obits = 0, dbits = 0;
 #endif
 
-    assert(!!fin ^ !!size);
+    assert(!!fin || !!size);
 
     /* We do not check that stream_id, offset, and size are smaller
      * than 2^62: this is not necessary, as this code will never generate
diff --git a/src/liblsquic/lsquic_send_ctl.c b/src/liblsquic/lsquic_send_ctl.c
index b99b5af..1574ca4 100644
--- a/src/liblsquic/lsquic_send_ctl.c
+++ b/src/liblsquic/lsquic_send_ctl.c
@@ -2013,7 +2013,8 @@ lsquic_send_ctl_next_packet_to_send (struct lsquic_send_ctl *ctl,
 
     if (packet_out->po_flags & PO_REPACKNO)
     {
-        if (packet_out->po_regen_sz < packet_out->po_data_sz)
+        if (packet_out->po_regen_sz < packet_out->po_data_sz
+            && packet_out->po_frame_types != QUIC_FTBIT_PADDING)
         {
             update_for_resending(ctl, packet_out);
             packet_out->po_flags &= ~PO_REPACKNO;
diff --git a/src/liblsquic/lsquic_stream.c b/src/liblsquic/lsquic_stream.c
index da1861d..90dbfaf 100644
--- a/src/liblsquic/lsquic_stream.c
+++ b/src/liblsquic/lsquic_stream.c
@@ -3308,7 +3308,7 @@ abort_connection (struct lsquic_stream *stream)
         TAILQ_INSERT_TAIL(&stream->conn_pub->service_streams, stream,
                                                 next_service_stream);
     stream->sm_qflags |= SMQF_ABORT_CONN;
-    LSQ_WARN("connection will be aborted");
+    LSQ_INFO("connection will be aborted");
     maybe_conn_to_tickable(stream);
 }