Merge branch 'rt/zlib-smaller-window'

* rt/zlib-smaller-window:
  test: consolidate definition of $LF
  Tolerate zlib deflation with window size < 32Kb

diff --cc sha1_file.c
Simple merge

diff --cc t/t1020-subdirectory.sh
Simple merge

diff --cc t/test-lib.sh
Simple merge