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

[nickm at torproject.org]

commit ed2cbbf71680fd2be67eb7b74c44572e58895d72
Merge: d0d2aba9f f3fa22bf1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 10 14:17:09 2020 -0500

    Merge branch 'maint-0.4.0' into release-0.4.0

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