Merge branch 'ls/macos-update' into maint

Portability update and workaround for builds on recent Mac OS X. * ls/macos-update: travis-ci: disable GIT_TEST_HTTPD for macOS Makefile: set NO_OPENSSL on macOS by default

Junio C Hamano committed Nov 29, 2016 at 13:27 UTC 729fb9ad34cda2609396a61697508c61ec7d9f04

No changes.