Update zlib to 1.2.8
Merge branch 'cmn/zlib-128' into cmn/zlib-update

Conflicts:
	deps/zlib/crc32.c
	deps/zlib/crc32.h
	deps/zlib/zconf.h
Merge branch 'cmn/zlib-update' into cmn/update-zlib
zlib: add a few missing defines
zlib: get rid of gz*
zlib: get rid of compress.c and uncompr.c
zlib: disable warning 4142 on MSVC

This is about benign redefinition of types. We're not interested in it.
Update text=auto / core.autocrlf=false behavior

Git for Windows 1.9.4 changed the behavior when the text=auto
attribute is specified and core.autocrlf=false.  Previous observed
behavior would *not* filter files when going into the working
directory, the new behavior *does* filter.  Update our behavior to match.
Export git_revert_commit
Merge pull request #2439 from ethomson/revert_export

Export git_revert_commit
Merge pull request #2435 from ethomson/text_attr

Update text=auto / core.autocrlf=false behavior
travis: build the master branch

We need to tell Travis to build the master branch or it won't build it
or the pull requests.
pack: free the new pack struct if we fail to insert

If we fail to insert the packfile in the map, make sure to free it.

This makes the free function only attempt to remove its mwindows from
the global list if we have opened the packfile to avoid accessing the
list unlocked.
tree: free in error conditions

As reported by coverity, we would leak some memory in error conditions.
pack: clean up error returns

Set a message when we fail to lock.

Also make the put function void, since it's called from free, which
cannot report errors. The only errors we can experience here are
internal state corruption, so we assert that we are trying to put a
pack which we have previously got.
Merge pull request #2442 from libgit2/cmn/leaks

Fix a couple of leaks
Fixes #2443 Zero size arrays are an extension
Merge pull request #2444 from libgit2/phkelley/flexarray

Fixes #2443 Zero size arrays are an extension
checkout::conflict tests: only test owner mode

The checkout::conflict type conflict tests were failing because
they were overly assertive about the resultant mode, testing
group & other bits, which failed miserably for people who had a
umask less restrictive than 022.  Only test the resultant owner bits.
Merge pull request #2445 from ethomson/checkout_conflict_test

checkout::conflict tests: only test owner mode