commit 2b6df3da21803519c262099ab9dd950271f3ce11 Merge: 41d52e9cd 99d044d55 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 10 14:17:03 2020 -0500

Merge branch 'bug33212_035' into maint-0.3.5

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