Merge updates from trunk.

FossilOrigin-Name: 53f2100a296f64d206f1caf2d754820a7898bb33b31a6ab2169957d228d5d2a0

diff --cc main.mk
Simple merge

diff --cc manifest
index 8dc3ba69cbac68f9d47ab47794bb49d1a81e2c86,a1b96501133c1713a118892b81045560aac68f78..50c19fd1569c043efdc61ed33c83ee1ead5be633
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Add\stests\scases\sand\sfix\ssome\sminor\szonefile\sproblems.
- D 2018-02-22T21:06:08.522
 -C Fix\sharmless\scompiler\swarnings\sin\sthe\szipfile\sextension\sseen\swith\sMSVC.
 -D 2018-02-23T13:38:54.742
++C Merge\supdates\sfrom\strunk.
++D 2018-02-23T13:45:05.056
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F Makefile.in 7a3f714b4fcf793108042b7b0a5c720b0b310ec84314d61ba7f3f49f27e550ea
+ F Makefile.in a2d2fb8d17c39ab5ec52beb27850b903949080848236923f436156b72a958737
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc b5e9eb7212c5a61d4800172c710376d1158fd5eea2edc0be8e05c0c372e767e4
- F README.md d748f58e3ab0fe0307fb4ae0942b415d93dcc4288756e366cc9e7cf8260c093f
+ F Makefile.msc bf19d3a0eb849bd3b114653b0e455aa5b2799a96f413287a5866013db0e47f30
+ F README.md 1d5342ebda97420f114283e604e5fe99b0da939d63b76d492eabbaae23488276
  F VERSION cdf91ac446255ecf3d8f6d8c3ee40d64123235ae5b3cef29d344e61b45ec3759
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -416,7 -411,7 +416,7 @@@ F ext/zonefile/zonefilefault.test 5a764
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 0efdf6ac125eb810494d72dd7016ab07ddf3e3fa8615a14aef8491b69818fbe4
 -F main.mk 04969462bfd32c9f08d4a6d40622e8c43c8c5ecfb2ee52ffb5737c5eca4b0c03
++F main.mk e5ac915f9959445602c07fd5aee00c5c09b4616658e67aa12e765399cd686763
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -1710,7 -1707,7 +1712,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 883e7e75d65622e8d06c46e48b7cc756cc0e3345b8124a8038cab0a8d51d0458
- R da39cc270268ef3a63a8351195aef15c
- U dan
- Z b265d0dff2f8716ab6f08f5f692e71fc
 -P e9e9f27b3d496531905ad7459cf60366ad3798f507266134dd6388cdec50fdc4
 -R 654cd747b1d6661b630741ec0eabab23
++P f4d42162fa2196078cea4db9c2247a08f5439d29e49f5e8dc23db317b8101865 15c587cf6ffc920dc37f67cacb4f0db6a603fb998a22a639f755387910516414
++R c9eb5aa421f123c9e5cf280b61bfc247
+ U mistachkin
 -Z f6be006b93932e4aec25faabbec16d8c
++Z 77c6473b56216379f2a9d96a44a69e0a

diff --cc manifest.uuid
index 1d3619e12a5ede509aad0425e6497be9495d97e6,3218ef0aa68e5f8ce12acd402ab6d37e5674d417..bc53b8d6cd4ce0b338728868af81239b8de1867d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f4d42162fa2196078cea4db9c2247a08f5439d29e49f5e8dc23db317b8101865
 -15c587cf6ffc920dc37f67cacb4f0db6a603fb998a22a639f755387910516414
++53f2100a296f64d206f1caf2d754820a7898bb33b31a6ab2169957d228d5d2a0