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

[nickm at torproject.org]

commit 0c90fc37ec7fcee01db6bc5e0784e759a7ec954c
Merge: c5e610af0 71c49f735
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 10 14:17:10 2020 -0500

    Merge branch 'maint-0.4.1' into maint-0.4.2

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