[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2

[ahf at torproject.org]

commit b81e24cda687e9633c18b741ed92ce6bafb77643
Merge: 19d579e8c 3e08dd9df
Author: Alexander Færøy <ahf at torproject.org>
Date:   Wed Jul 8 00:36:47 2020 +0000

    Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)