[upstream] apr-1.5.1 and gnutls-3.3.1