commit b0e6ec627cb76478507a746090b64c0458723460 Merge: 26cfac1880 4876409c2a Author: Alexander Færøy ahf@torproject.org Date: Wed Oct 28 15:39:37 2020 +0000

Merge branch 'maint-0.4.3' into maint-0.4.4

changes/ticket40133 | 5 ++ src/core/or/protover.c | 4 +- src/rust/protover/errors.rs | 2 +- src/rust/protover/protoset.rs | 20 +++++--- src/rust/protover/protover.rs | 10 ++-- src/rust/protover/tests/protover.rs | 60 +++++++----------------- src/test/test_protover.c | 91 +++++++++---------------------------- 7 files changed, 66 insertions(+), 126 deletions(-)