[tor-commits] [tor/master] Merge branch 'bug33032_043' into bug33032_master

[asn at torproject.org]

commit 169aea023deb4333f2ed3dc191b643c409e16f11
Merge: df3f2bd9a eed196f12
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 11 10:35:47 2020 -0400

    Merge branch 'bug33032_043' into bug33032_master

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