Merge branch 'upstream-LibArchive' into update-libarchive * upstream-LibArchive: LibArchive 2020-12-26 (227a4b97)