commit c3ad2a1d2367d6c0ba5c1c81491770056e881a77 Merge: bebdd2888 5721ec22d Author: Alexander Færøy ahf@torproject.org Date: Tue Jun 30 13:47:55 2020 +0000

Merge branch 'tor-github/pr/1785' into maint-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(-)