commit bd7174bb98af05f05d3220f12e8aec9cd68b3e1a Merge: be3baeb87 b81e24cda Author: Alexander Færøy ahf@torproject.org Date: Wed Jul 8 00:36:48 2020 +0000

Merge branch 'maint-0.4.2' into release-0.4.2

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