commit d2cbefbb8f26a17742629251023e786f12a6f555 Merge: 06df2f51d 71c49f735 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 10 14:17:10 2020 -0500

Merge branch 'maint-0.4.1' into release-0.4.1

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