[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2

[ahf at torproject.org]

commit 19d9d0ee53dac7d7411048be5509174d996933f1
Merge: c10323faa 483082b57
Author: Alexander Færøy <ahf at torproject.org>
Date:   Tue Jun 30 13:48:49 2020 +0000

    Merge branch 'maint-0.4.2' into release-0.4.2

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