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

[asn at torproject.org]

commit eed196f122bc83d77a86a3d15659aac1201ed219
Merge: f0646919a 554b80509
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 11 10:35:47 2020 -0400

    Merge branch 'bug33032_042' into bug33032_043

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