Merge branch 'feature/esp_http_client_global_ca_store_v3.2' into 'release/v3.2'

author Angus Gratton <angus@espressif.com>

Fri, 26 Apr 2019 02:08:23 +0000 (10:08 +0800)

committer Angus Gratton <angus@espressif.com>

Fri, 26 Apr 2019 02:08:23 +0000 (10:08 +0800)
author Angus Gratton <angus@espressif.com>
Fri, 26 Apr 2019 02:08:23 +0000 (10:08 +0800)
committer Angus Gratton <angus@espressif.com>
Fri, 26 Apr 2019 02:08:23 +0000 (10:08 +0800)
diff --cc components/esp_http_client/esp_http_client.c
Simple merge
diff --cc components/esp_http_client/include/esp_http_client.h
Simple merge
author	Angus Gratton <angus@espressif.com>
	Fri, 26 Apr 2019 02:08:23 +0000 (10:08 +0800)
committer	Angus Gratton <angus@espressif.com>
	Fri, 26 Apr 2019 02:08:23 +0000 (10:08 +0800)
		1	2
components/esp_http_client/esp_http_client.c	patch \|	diff1 \|	diff2 \|	blob \| history
components/esp_http_client/include/esp_http_client.h	patch \|	diff1 \|	diff2 \|	blob \| history