Merge remote-tracking branch 'origin/master' into debian

In particular update root of tree

diff --combined Makefile.am
index 251c5b9,84f7491..251c5b9
--- 1/lib/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -16,6 -16,7 +16,6 @@@ ACLOCAL_AMFLAGS = -I m
  # the library interface is _extended_. Set AGE to 0 when the library
  # interface is _changed_.
  
 -
  SUBDIRS = radius radsecproxy include . examples
  DIST_SUBDIRS = $(SUBDIRS) tests
  

diff --combined libradsec.spec.in
index e301aff,97d6178..e301aff
--- 1/lib/libradsec.spec.in
--- 2/libradsec.spec.in
+++ b/libradsec.spec.in
@@@ -41,7 -41,7 +41,7 @@@ developing applications that use %{name
  %build
        export CPPFLAGS='-I%{_includedir}'
        export LDFLAGS='-L%{_libdir}'
 -%configure --disable-static
 +%configure --disable-static --enable-tls --enable-tls-psk
  make %{?_smp_mflags}
  
  

diff --combined radius/Makefile.am
index ba09db0,462a1e0..ba09db0
--- 1/lib/radius/Makefile.am
--- 2/radius/Makefile.am
+++ b/radius/Makefile.am
@@@ -1,7 -1,6 +1,7 @@@
  AUTOMAKE_OPTIONS = foreign
  ACLOCAL_AMFLAGS = -I m4
  
 +BUILT_SOURCES = dictionaries.c
  AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)
  AM_CFLAGS = -Wall -g
  
@@@ -12,7 -11,6 +12,7 @@@ libradsec_radius_la_SOURCES = 
        crypto.c \
        custom.c \
        dict.c \
 +      client.h \
        id.c \
        parse.c \
        print.c \