From 8c44fb8471073c975464593b3e90698d3699094e Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Mon, 15 Apr 2024 09:51:50 +0200
Subject: [PATCH 1/2] note Sync type aliases in changelog

---
 docs/source/changelog.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/source/changelog.md b/docs/source/changelog.md
index 8313365ba..484318a7e 100644
--- a/docs/source/changelog.md
+++ b/docs/source/changelog.md
@@ -36,6 +36,9 @@ __New__:
 - Experimental support for wheels on windows-arm64
 - `Socket.bind('tcp://ip:0')` can be used as a context manager to bind to a random port.
   The resulting URL can be retrieved as `socket.last_endpoint`.
+- Add `SyncSocket` and `SyncContext` type aliases for the default Socket/Context implementations,
+  since the base classes are Generics, type-wise.
+  These are type aliases only to be used in type checking, not actual classes.
 
 __Enhancements__:
 

From 72006081c733b11b91464362592994f655762aa5 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Mon, 4 Dec 2023 21:28:17 +0100
Subject: [PATCH 2/2] changelog for 25.1.2

---
 docs/source/changelog.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/source/changelog.md b/docs/source/changelog.md
index 484318a7e..7e38d4dab 100644
--- a/docs/source/changelog.md
+++ b/docs/source/changelog.md
@@ -57,6 +57,11 @@ __Breaking changes__:
 
 ## 25
 
+### 25.1.2
+
+- Fix builds with some recent compilers and bundled libzmq
+- Fix builds with upcoming Cython 3.1
+
 ### 25.1.1
 
 25.1.1 is the first stable release with Python 3.12 wheels.