commit 483082b57bfb2535477530fe84d8c92c70be2fa1 Merge: b0bfee8c7 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 maint-0.4.2 changes/bug33032 | 6 ++++++ src/lib/encoding/pem.c | 8 +++++++- src/test/test_pem.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-)