commit 554b805093f98418a6f50a2246a8572ec0329a24 Merge: ff5220536 55055396c Author: Nick Mathewson <nickm@torproject.org> Date: Wed Mar 11 10:35:47 2020 -0400 Merge branch 'bug33032_041' into bug33032_042 changes/bug33032 | 6 ++++++ src/lib/encoding/pem.c | 8 +++++++- src/test/test_pem.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-)