[network-manager-openvpn: 6/6] Merge branch 'bg/options'

[Beniamino Galvani <bgalvani src gnome org>]

commit d90cf9105e33fd4f646adf4f1ef8b9f95afc737b
Merge: 1c2b67e caa88cc
Author: Beniamino Galvani <bgalvani redhat com>
Date:   Fri May 12 22:52:37 2017 +0200

    Merge branch 'bg/options'
    
    Add support for tls-crypt and mtu-disc options.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=777768
    https://bugzilla.gnome.org/show_bug.cgi?id=781592

 Makefile.am                           |    2 +
 properties/auth-helpers.c             |  161 +++++++++----
 properties/import-export.c            |   44 +++-
 properties/nm-openvpn-dialog.ui       |  264 +++++++++++++++------
 properties/tests/conf/mtu-disc.ovpn   |   28 +++
 properties/tests/conf/tls2.ovpn       |   26 ++
 properties/tests/test-import-export.c |  428 ++++++++-------------------------
 shared/nm-service-defines.h           |    2 +
 shared/utils.h                        |    2 +
 src/nm-openvpn-service.c              |   19 ++-
 10 files changed, 523 insertions(+), 453 deletions(-)
---