Merge trunk changes into this branch.

FossilOrigin-Name: 9945206e6e26a48a49b9747650d299eb983cc21a3a61c621cd81f0bbc85a74d7

diff --cc manifest
index 3fc85c61edb6fa09692c863d61056e56b56def20,5a40bbd21d5129a395bd39a5e35441a718d2ba40..31fbff973a60963743f5d8677cec1f3a84025468
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sthe\sfts5\sxInstToken()\sAPI\sfor\sprefix\squeries\sthat\sdo\snot\suse\sprefix-indexes.\sThis\sis\sexperimental.
- D 2024-09-14T20:30:14.441
 -C Fix\sa\smemory\sleak\sin\ssqlite3expert.c\sintroduced\sby\s[f1d76c86].
 -D 2024-09-24T15:11:34.516
++C Merge\strunk\schanges\sinto\sthis\sbranch.
++D 2024-09-24T15:43:52.339
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2214,11 -2213,8 +2214,8 @@@ F vsixtest/vsixtest.tcl 6195aba1f12a5e1
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 50762ba0783a04e0dcd9456a1ae17d875b0a9272f2f09854a23d9d5253761e9f
- R 7d932f341b9d462f57fdca7d1de99fb1
- T *branch * fts5-tokendata-prefix
- T *sym-fts5-tokendata-prefix *
- T -sym-trunk *
 -P f1d76c8636866424fe0b57d8814b8bb1a0ed4e2ca1b75d8e308d4b962ad8dc3b
 -R 3c493af72ec7c0caf9ac1da3817622db
++P 97c2824f471e7e622c4a166947a6e8162cae891345101539829a6fcec83373fe 42bb941584a1ac922ee6b0b6ecadce71c9259555563cf49913a6f820f3f9b887
++R cb71c4478793484afa282b1a3cf11afa
  U dan
- Z 82ecce364e38343eb4f3cc0cc45881c8
 -Z 3984c94792299f2aa3da5c0fd5ebea46
++Z efd6491e97a3bc8cd929e608bea6d1a9
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 77dd09f207cb0f97652ac3009f595637c05f79f2,f9ccf18fa564c5b1ebec596d96773fda99cc9fcd..dc0287798701dd297740fbe83bb81dc85319b91c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 97c2824f471e7e622c4a166947a6e8162cae891345101539829a6fcec83373fe
 -42bb941584a1ac922ee6b0b6ecadce71c9259555563cf49913a6f820f3f9b887
++9945206e6e26a48a49b9747650d299eb983cc21a3a61c621cd81f0bbc85a74d7