commit f8ff2f12d48ede0186f4c921d773bc51d82128e1 Merge: b8bfea163 0c90fc37e Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 10 14:17:10 2020 -0500

Merge branch 'maint-0.4.2' into release-0.4.2

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