Version 2.3.2

* Cherry-pick 3972f738ca4e91104e2d6dad9bb1f36147879e98 to stable
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e47fd8..931efb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.3.2
+
+* Cherry-pick 3972f738ca4e91104e2d6dad9bb1f36147879e98 to stable
+
 ## 2.3.2 - 2019-06-11
 
 This is a patch version release with a security improvement.
diff --git a/tools/VERSION b/tools/VERSION
index b9a33e9..e9acdfb 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -32,7 +32,7 @@
 CHANNEL stable
 MAJOR 2
 MINOR 3
-PATCH 1
+PATCH 2
 PRERELEASE 0
 PRERELEASE_PATCH 0
 ABI_VERSION 4