Merge changes from the win-blocking-locks branch into this one.

FossilOrigin-Name: 85fd18d7a2ea96d40fc1d59778ad5eabd0a42f775c417ece183b230eea57a993

diff --cc manifest
index 8bbb9878ce8ba33f1f1f9a9c11b8609106f7ffe6,1679c1a9a336bb185220e8e9ec1976310aae866a..9d5f61c82a9243c30eb3f903eba961102de710d5
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Revise\sthe\stestthread3.walthread6\stest\scase\sto\sbetter\sdemonstrate\sthe\sadvantages\sof\sblocking\slocks.
- D 2021-07-19T20:34:08.583
 -C Minor\senhancements\sto\snew\sOSTRACE\smessages.
 -D 2021-07-19T03:37:09.404
++C Merge\schanges\sfrom\sthe\swin-blocking-locks\sbranch\sinto\sthis\sone.
++D 2021-07-20T17:23:02.039
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -528,8 -528,8 +528,8 @@@ F src/os.c 59ed1f503347e8b5434c0ce7d7d0
  F src/os.h 26890f540b475598cd9881dcc68931377b8d429d3ea3e2eeb64470cde64199f8
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 -F src/os_unix.c b11e4610769922253dec27d7af4a07ff84f65169d19bda5e9b12a152a706f7f5
 +F src/os_unix.c aea96704db0860b61ad95272bd9cb3fc3a4910e6d68506cc6c48d5d8f7922d0b
- F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
+ F src/os_win.c f1727066bfbf4c3a4308442a6b43699e2cb3fe8905e29c0f4cb73f402d04a184
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
  F src/pager.c 95c255256b13827caf038c8f963d334784073f38ab6ef9d70371d9d04f3c43e0
  F src/pager.h 4bf9b3213a4b2bebbced5eaa8b219cf25d4a82f385d093cd64b7e93e5285f66f
@@@ -1920,7 -1920,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 853c621bb2cf9995a6c942376a3760b90abeacafef29f364bea41d270aee385f
- R f527861180a06f0db63219f4b714e45c
 -P 584c24252a37ef050ced5926a93e52fc47a41d9017b291dc1c1c796712e391d7
 -R ec8d709aae6243cae1e8538086c8738b
 -U mistachkin
 -Z 75f70c9db372d7b49e7d3c6bedb72509
++P 952b4cae49cc6872e6e6075eeaca46506170377237ab74884cefd144bb52c743 3249a6a38d9c86d45d5d04b32d552f306d12fd4d3c94d2efed192104c0c3948a
++R 42718b88d29a1380262773ee0259a1be
 +U dan
- Z b17984f68a1f0fc20c94e3c2e97e886a
++Z 6d0b04621fe7742f4e6ae70108d87665

diff --cc manifest.uuid
index 2d5cf003bb8e727cadde525eebe79c9574ad8958,500488841cecb51c217ab3ecb9f842d83bc4b3f4..afa9caead094af39b72e35978787bb68c8e6bd3e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 952b4cae49cc6872e6e6075eeaca46506170377237ab74884cefd144bb52c743
 -3249a6a38d9c86d45d5d04b32d552f306d12fd4d3c94d2efed192104c0c3948a
++85fd18d7a2ea96d40fc1d59778ad5eabd0a42f775c417ece183b230eea57a993