1
0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-12-03 11:51:24 +03:00
Files
mbedtls/library/ssl_cli.c
Gilles Peskine d91f2a26cb Merge branch 'development' into iotssl-1251-2.7
Conflict resolution:

* ChangeLog: put the new entries in their rightful place.
* library/x509write_crt.c: the change in development was whitespace
  only, so use the one from the iotssl-1251 feature branch.
2018-01-19 11:25:10 +01:00

115 KiB