commit 29420ab396cffb4b3c062b76fc859cc01f2206b7 Merge: e380396d4 eed196f12 Author: George Kadianakis <desnacked@riseup.net> Date: Mon Mar 23 16:56:59 2020 +0200 Merge branch 'tor-github/pr/1788' into maint-0.4.3 changes/bug33032 | 6 ++++++ src/lib/encoding/pem.c | 8 +++++++- src/test/test_pem.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-)