Merge branch 'tmp-get-keylog-func' into 'master'

gnutls_session_get_keylog_function: new function

See merge request gnutls/gnutls!1220

diff --cc NEWS
index 5348151679c72aa358484ffce225c9d5a3ea87fc,0e5c400a316237088f1a42f4390946fad77e893d..f9f8f5acadff2355b87f98b3f972d226f4b19880
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -19,12 -16,9 +19,13 @@@ See the end for copying conditions
  gnutls_hkdf_extract: Added
  gnutls_hkdf_expand: Added
  gnutls_pbkdf2: Added
+ gnutls_session_get_keylog_function: Added
  gnutls_session_set_keylog_function: Added
  gnutls_prf_hash_get: Added
 +gnutls_psk_server_get_username2: Added
 +gnutls_psk_set_client_credentials2: Added
 +gnutls_psk_set_client_credentials_function2: Added
 +gnutls_psk_set_server_credentials_function2: Added
  
  * Version 3.6.12 (released 2020-02-01)
  

diff --cc devel/libgnutls-latest-x86_64.abi
Simple merge

diff --cc devel/symbols.last
Simple merge

diff --cc doc/Makefile.am
Simple merge

diff --cc doc/manpages/Makefile.am
Simple merge

diff --cc lib/includes/gnutls/gnutls.h.in
Simple merge

diff --cc lib/libgnutls.map
index 7c3187541d48eadb965e5dae8c1e50ac95885371,97fc97f15270dbe857eac28007d7c2a4baa0f194..5541e9caba7bdbde5c4e4e6224786abe07f299bd
--- 1/lib/libgnutls.map
--- 2/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@@ -1315,12 -1315,9 +1315,13 @@@ GNUTLS_3_6_1
        gnutls_hkdf_extract;
        gnutls_hkdf_expand;
        gnutls_pbkdf2;
+       gnutls_session_get_keylog_function;
        gnutls_session_set_keylog_function;
        gnutls_prf_hash_get;
 +      gnutls_psk_server_get_username2;
 +      gnutls_psk_set_server_credentials_function2;
 +      gnutls_psk_set_client_credentials2;
 +      gnutls_psk_set_client_credentials_function2;
  } GNUTLS_3_6_12;
  
  GNUTLS_FIPS140_3_4 {