commit c364e0e83bd98bf66b68cdacff28ad6c5924abf5 Merge: a213d2793 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 maint-0.4.3

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