From 5be9e024d18386f650c7f58f640dfa5f5dcdf066 Mon Sep 17 00:00:00 2001
From: David Bremner <david@tethera.net>
Date: Tue, 22 Jun 2021 20:08:13 -0300
Subject: [PATCH 1/3] doc: tweak hook configuration documentation.

Add a historical note, and hint to look below for more about hooks.
Capitalized the heading for consistency, removed blank line.
---
 doc/man1/notmuch-config.rst | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/man1/notmuch-config.rst b/doc/man1/notmuch-config.rst
index 75c59ff9..209226a3 100644
--- a/doc/man1/notmuch-config.rst
+++ b/doc/man1/notmuch-config.rst
@@ -74,10 +74,13 @@ paths are presumed relative to `$HOME` for items in section
     `backups`.
 
 **database.hook_dir**
-
     Directory containing hooks run by notmuch commands. See
     **notmuch-hooks(5)**.
 
+    History: this configuration value was introduced in notmuch 0.32.
+
+    Default: See HOOKS, below.
+
 **user.name**
     Your full name.
 
@@ -256,7 +259,7 @@ If ``NOTMUCH_CONFIG`` is unset, notmuch tries (in order)
 - ``${HOME}/.notmuch-config<profile>`` where ``<profile>`` is
   ``.$NOTMUCH_PROFILE`` or ""
 
-Hooks
+HOOKS
 -----
 
 If ``database.hook_dir`` is unset, notmuch tries (in order)

From 636e03a9caec25b1aae5df44ed3feea6d607a5d2 Mon Sep 17 00:00:00 2001
From: David Bremner <david@tethera.net>
Date: Fri, 25 Jun 2021 09:02:54 -0300
Subject: [PATCH 2/3] version: bump to 0.32.2

---
 bindings/python-cffi/version.txt   | 2 +-
 bindings/python/notmuch/version.py | 2 +-
 version.txt                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bindings/python-cffi/version.txt b/bindings/python-cffi/version.txt
index fd9620c0..989b29cc 100644
--- a/bindings/python-cffi/version.txt
+++ b/bindings/python-cffi/version.txt
@@ -1 +1 @@
-0.32.1
+0.32.2
diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index fc867ea7..de104bfa 100644
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.32.1'
+__VERSION__ = '0.32.2'
 SOVERSION = '5'
diff --git a/version.txt b/version.txt
index fd9620c0..989b29cc 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.32.1
+0.32.2

From 35d559eb18d779822074a0781585642028e61ed8 Mon Sep 17 00:00:00 2001
From: David Bremner <david@tethera.net>
Date: Fri, 18 Jun 2021 21:59:44 -0300
Subject: [PATCH 3/3] lib/config: fix memory leak

This commit fixes a small memory leak (per iterator restart) by
actually using the talloc context intended to be blown away on
restart.
---
 lib/config.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/config.cc b/lib/config.cc
index 0ec66372..368ed669 100644
--- a/lib/config.cc
+++ b/lib/config.cc
@@ -318,7 +318,7 @@ notmuch_config_values_valid (notmuch_config_values_t *values)
 const char *
 notmuch_config_values_get (notmuch_config_values_t *values)
 {
-    return talloc_strndup (values, values->iterator, values->tok_len);
+    return talloc_strndup (values->children, values->iterator, values->tok_len);
 }
 
 void