[NetworkManager-openvpn: 2/2] Merge branch 'wip/ernestask/tls-crypt-v2-client'

[Beniamino Galvani <bgalvani src gnome org>]

commit f411052608ad52a30468d258b9c1a8dad6bd1d5c
Merge: fdbcb3f 717a1d4
Author: Beniamino Galvani <bgalvani redhat com>
Date:   Wed Jan 27 15:55:40 2021 +0100

    Merge branch 'wip/ernestask/tls-crypt-v2-client'
    
    https://gitlab.gnome.org/GNOME/NetworkManager-openvpn/-/merge_requests/33

 Makefile.am                           |  1 +
 properties/import-export.c            | 16 ++++++++++-
 properties/nm-openvpn-dialog.ui       |  3 +++
 properties/nm-openvpn-editor.c        | 23 ++++++++++++----
 properties/tests/conf/tls4.ovpn       | 28 +++++++++++++++++++
 properties/tests/test-import-export.c | 51 +++++++++++++++++++++++++++++++++++
 shared/nm-service-defines.h           |  1 +
 shared/utils.h                        |  1 +
 src/nm-openvpn-service.c              |  7 +++++
 9 files changed, 125 insertions(+), 6 deletions(-)
---