commit 2eb9af0296a51059804cc6c9df62d86703cabb9a Merge: 91d792388 c3ad2a1d2 Author: Alexander Færøy ahf@torproject.org Date: Tue Jun 30 13:48:49 2020 +0000

Merge branch 'maint-0.3.5' into release-0.3.5

changes/bug33032 | 6 ++++++ src/lib/encoding/pem.c | 8 +++++++- src/test/test_pem.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-)