Update this branch with latest fixes from trunk.

FossilOrigin-Name: 12363f8e176690d237b06e2fa6e9e3710574bdf841b8f6cef0cce34646367aa1

diff --cc manifest
index 25808ccc092e7542fe6a55aff3a058774829d65f,d5fcc85f69999396601291c9f62df2be3884a0f1..3255b6f093e7dc2226a770d5c1783d6af0c668f7
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
- D 2021-03-11T10:55:08.955
 -C Fix\sa\sTcl\sobject\sleak\sin\stest_session.c.
 -D 2021-03-11T15:57:25.662
++C Update\sthis\sbranch\swith\slatest\sfixes\sfrom\strunk.
++D 2021-03-11T21:00:42.178
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1920,7 -1910,7 +1920,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 73bf458e1dbe21e19b7b283d5d7534dd8bcb01475570958fc2291e805c1cc56d b7c92e1d08f213865f026d8dbdc4e805fb5c119b7f206506ed06e83a878de657
- R b12f45aef4ecd9a54fa5db9146a2ee13
 -P 41df3bbefd63151f2ddb920066777eab8e07ecfc0edb0f71f9493debe0a4a2c4
 -R b666bc7b205c8c86bf444d94812f9f9d
++P ef8c6e06cb094c5a6f5862f0f3f2a67c3db40dc39e520cc421311bcb55e0f762 07150cf15ad36c7fc681a911f66db23d610ddf110a7be7f1fcefbd8750cd135a
++R 0e4b18617058170b91597c286f1d19e6
  U dan
- Z b40cfd4707493fd59c27af8a545b27ce
 -Z 524885d968dca30473cc8b50af6a719f
++Z 75fb1df96bd21be35fce6850478b09a7

diff --cc manifest.uuid
index 8bcc91414f5a024aabfccf8f3ae7ebbbc6d99351,461fef36d195f21f700e874df694cea537f92fdd..9cf1b3cc6586606e8c6eb2e50d80fe02f9d75c85
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ef8c6e06cb094c5a6f5862f0f3f2a67c3db40dc39e520cc421311bcb55e0f762
 -07150cf15ad36c7fc681a911f66db23d610ddf110a7be7f1fcefbd8750cd135a
++12363f8e176690d237b06e2fa6e9e3710574bdf841b8f6cef0cce34646367aa1