Merge branch 'bugfix/add_encrypt_option_for_esptouch_v1' into 'master'

esp_wifi: Add encrypt option for ESPTouch v1

Closes WIFI-3235 and WIFI-3408

See merge request espressif/esp-idf!12533
This commit is contained in:
Jiang Jiang Jian
2021-02-26 13:33:42 +00:00