From aabc208318eba67e4c5f791283e453c40a5bf3e1 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sun, 26 Jan 2020 21:21:05 +0800
Subject: [PATCH 1/2] Release 3.1b1

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b13ba82c6..b77aa5c0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# fish 3.1b1
+# fish 3.1b1 (released January 26, 2020)
 
 ## Notable improvements and fixes
 - A new `$pipestatus` variable contains a list of exit statuses of the previous job, for each of the separate commands in a pipeline (#5632).

From b313ba555afc2c42f0c46cfd15bed2cbee490986 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 30 Jan 2020 17:21:15 +0800
Subject: [PATCH 2/2] iothread: add missing #include

Closes #6553.
---
 src/iothread.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/iothread.cpp b/src/iothread.cpp
index c62226aad..21017fbe7 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -6,6 +6,7 @@
 #include <pthread.h>
 #include <signal.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/select.h>
 #include <sys/time.h>
 #include <sys/types.h>