From: Nikos Mavrogiannopoulos Date: Thu, 20 Sep 2018 14:29:52 +0000 (+0000) Subject: Merge branch 'tmp-res-prio' into 'master' X-Git-Tag: gnutls_3_6_4~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0211809de5fa660ced0a4391d2af2897a4cf148;p=thirdparty%2Fgnutls.git Merge branch 'tmp-res-prio' into 'master' Fix issue introduced in 20886264fe See merge request gnutls/gnutls!756 --- c0211809de5fa660ced0a4391d2af2897a4cf148