[tor-commits] [tor/master] Merge branch 'maint-0.4.2'

[nickm at torproject.org]

commit d9144700af5602cc267c0d147145c100567fdbb3
Merge: dab0b1c3a 0c90fc37e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 10 14:17:10 2020 -0500

    Merge branch 'maint-0.4.2'

 changes/ticket33212           | 4 ++++
 src/rust/protover/protover.rs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)