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

[nickm at torproject.org]

commit 71c49f735636d626abaa13222aa14e7c97f73393
Merge: 7afb95d3e f3fa22bf1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 10 14:17:10 2020 -0500

    Merge branch 'maint-0.4.0' into maint-0.4.1

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