Merge from trunk.

FossilOrigin-Name: eae8236f3b9bc326648d1c8fca61cb3c38f821d06fe915fd0978cffeb1f6152b

diff --cc manifest
index 1c494e65737b1030bd8a6e8f5a4ba3d327662d60,f2db2d8e7a00bc507b2f1c97b2059f248f9e1edb..00184c3928964e6036c7f5cddc6aec3e35c7b813
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sappendvfs\sbug\sexposed\swith\sbigger\sfiles,\sand\sadd\stests\sfor\ssuch\sconditions.
- D 2021-03-16T06:41:51.332
 -C Version\s3.35.1
 -D 2021-03-15T16:53:57.484
++C Merge\sfrom\strunk.
++D 2021-03-16T06:50:39.815
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1910,7 -1910,9 +1910,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 026edd601444d86858a503ffc3be17667a62a29f09c001009d9a678400b3b0a1
- R 3f7323614d0b0269053ff308d3cf0c77
 -P 0915f969f429a8d0b594e937e0128d5476774d9bbe4a24081dbc60273cb5bb9a
 -R 2b3598619c1684078c28a748b557717f
 -T +sym-release *
 -T +sym-version-3.35.1 *
 -U drh
 -Z b6e46b43ad7d89d09a3fbf23443eb714
++P 19b1f53a1c0a14440ae8ac71660a2595d37a4a5b201055c19366c7dca75d6660 aea12399bf1fdc76af43499d4624c3afa17c3e6c2459b71c195804bb98def66a
++R 7ca2567aac2bb3bf35e5b9b280905d1f
 +U larrybr
- Z 1150e673d6f8e609bf947bc6b9f00cc8
++Z 4b3a7e0be93199f4ec9eb27099986229

diff --cc manifest.uuid
index 1e3cbd1570a00b2163093ff62fa8c62f20a0e231,8d134baaf5e39cd889dc49592d20ad2c74d55641..cd8ff74516a6466ed2d485805e146e80faa9f6b1
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 19b1f53a1c0a14440ae8ac71660a2595d37a4a5b201055c19366c7dca75d6660
 -aea12399bf1fdc76af43499d4624c3afa17c3e6c2459b71c195804bb98def66a
++eae8236f3b9bc326648d1c8fca61cb3c38f821d06fe915fd0978cffeb1f6152b