commit f3fa22bf1b52dfce65a37e6a84bac8635916e8c2 Merge: 65825018c 2b6df3da2 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 10 14:17:09 2020 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

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