From cdbf091c0d4845b09db8c48102af3ccbd1b53f31 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 3 Dec 2019 10:03:44 +0100
Subject: [PATCH] Changelog entry for merge of #124. - Merge pull request #124
 from rmetrich: Changed log lock   from 'quick' to 'basic' because this is an
 I/O lock.

---
 doc/Changelog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 066a4707e..560e22ca3 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+3 December 2019: Wouter
+	- Merge pull request #124 from rmetrich: Changed log lock
+	  from 'quick' to 'basic' because this is an I/O lock.
+
 2 December 2019: Wouter
 	- Merge pull request #122 from he32: In tcp_callback_writer(),
 	  don't disable time-out when changing to read.