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

Merge branch 'maint-0.3.5' into release-0.3.5

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