Merge branch 'lt/maint-wrap-zlib' into maint

* lt/maint-wrap-zlib: Wrap inflate and other zlib routines for better error reporting Conflicts: http-push.c http-walker.c sha1_file.c